diff options
author | Prafulla Wadaskar <prafulla@marvell.com> | 2009-07-01 20:34:51 +0200 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-07-06 21:52:53 +0200 |
commit | 0b785ddd60120cfb74d18e58c56054238219f6db (patch) | |
tree | 3775bcfe575e8568fa42d3f8c54136342f63343d /drivers/net | |
parent | 33b1d3f43a16fbb79004075ce89ae4e618b288a2 (diff) | |
download | u-boot-imx-0b785ddd60120cfb74d18e58c56054238219f6db.zip u-boot-imx-0b785ddd60120cfb74d18e58c56054238219f6db.tar.gz u-boot-imx-0b785ddd60120cfb74d18e58c56054238219f6db.tar.bz2 |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/kirkwood_egiga.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ int kirkwood_egiga_initialize(bd_t * bis) #endif } return 0; +} |