| commit | 0b785ddd60120cfb74d18e58c56054238219f6db | [log] [tgz] |
|---|---|---|
| author | Prafulla Wadaskar <prafulla@marvell.com> | Wed Jul 01 20:34:51 2009 +0200 |
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | Mon Jul 06 21:52:53 2009 +0200 |
| tree | 3775bcfe575e8568fa42d3f8c54136342f63343d | |
| parent | 33b1d3f43a16fbb79004075ce89ae4e618b288a2 [diff] |
net: merge bugfix: Marvell Kirkwood gigabit ethernet driver 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 <prafulla@marvell.com> Acked-by: Ben Warren <biggerbadderben@gmail.com>
diff --git a/drivers/net/kirkwood_egiga.c b/drivers/net/kirkwood_egiga.c index b43bbf2..3c5db19 100644 --- a/drivers/net/kirkwood_egiga.c +++ b/drivers/net/kirkwood_egiga.c
@@ -662,3 +662,4 @@ #endif } return 0; +}