net: merge bugfix: Marvell Kirkwood gigabit ethernet driver
authorPrafulla Wadaskar <prafulla@marvell.com>
Wed, 1 Jul 2009 18:34:51 +0000 (20:34 +0200)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
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 <prafulla@marvell.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
drivers/net/kirkwood_egiga.c

index b43bbf2b3d208d293b5a84cde904bd9aefbfd97e..3c5db19cb084fce8ad98505cbf9e5ce685c29ab3 100644 (file)
@@ -662,3 +662,4 @@ int kirkwood_egiga_initialize(bd_t * bis)
 #endif
        }
        return 0;
+}