projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
33b1d3f
)
net: merge bugfix: Marvell Kirkwood gigabit ethernet driver
author
Prafulla Wadaskar
<
[email protected]
>
Wed, 1 Jul 2009 18:34:51 +0000
(20:34 +0200)
committer
Jean-Christophe PLAGNIOL-VILLARD
<
[email protected]
>
Mon, 6 Jul 2009 19:52:53 +0000
(21:52 +0200)
This patch looks okay on u-boot-net.git/next branch
but when it was merged to u-boot.git/master the last line is missing
Signed-off-by: Prafulla Wadaskar <
[email protected]
>
Acked-by: Ben Warren <
[email protected]
>
drivers/net/kirkwood_egiga.c
patch
|
blob
|
history
diff --git
a/drivers/net/kirkwood_egiga.c
b/drivers/net/kirkwood_egiga.c
index b43bbf2b3d208d293b5a84cde904bd9aefbfd97e..3c5db19cb084fce8ad98505cbf9e5ce685c29ab3 100644
(file)
--- a/
drivers/net/kirkwood_egiga.c
+++ b/
drivers/net/kirkwood_egiga.c
@@
-662,3
+662,4
@@
int kirkwood_egiga_initialize(bd_t * bis)
#endif
}
return 0;
+}