From: Prafulla Wadaskar <prafulla@marvell.com>
Date: Wed, 1 Jul 2009 18:34:51 +0000 (+0200)
Subject: net: merge bugfix: Marvell Kirkwood gigabit ethernet driver
X-Git-Tag: v2009.08-rc1~118^2~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0b785ddd60120cfb74d18e58c56054238219f6db;p=u-boot

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 b43bbf2b3d..3c5db19cb0 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;
+}