From 3262ca8f06a44c4ec3cd0c3b7f7fa717fa6ba3c5 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 17 Apr 2012 17:06:34 +1000
Subject: [PATCH] --- yaml --- r: 299372 b: refs/heads/master c:
 938ed25008d665d1dd937ca251d1aabb363113c6 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/m68k/configs/m5275evb_defconfig | 1 -
 trunk/arch/m68k/platform/527x/config.c     | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 477173978c0b..774cef945732 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfdd769ac51cb68cb99902192fac81bc67cb23b0
+refs/heads/master: 938ed25008d665d1dd937ca251d1aabb363113c6
diff --git a/trunk/arch/m68k/configs/m5275evb_defconfig b/trunk/arch/m68k/configs/m5275evb_defconfig
index 33c32aeca12b..a1230e82bb1e 100644
--- a/trunk/arch/m68k/configs/m5275evb_defconfig
+++ b/trunk/arch/m68k/configs/m5275evb_defconfig
@@ -49,7 +49,6 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_FEC=y
-CONFIG_FEC2=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_PPP=y
diff --git a/trunk/arch/m68k/platform/527x/config.c b/trunk/arch/m68k/platform/527x/config.c
index 7ed848c3b848..f91a53294c35 100644
--- a/trunk/arch/m68k/platform/527x/config.c
+++ b/trunk/arch/m68k/platform/527x/config.c
@@ -74,9 +74,7 @@ static void __init m527x_fec_init(void)
 	writew(par | 0xf00, MCF_IPSBAR + 0x100082);
 	v = readb(MCF_IPSBAR + 0x100078);
 	writeb(v | 0xc0, MCF_IPSBAR + 0x100078);
-#endif
 
-#ifdef CONFIG_FEC2
 	/* Set multi-function pins to ethernet mode for fec1 */
 	par = readw(MCF_IPSBAR + 0x100082);
 	writew(par | 0xa0, MCF_IPSBAR + 0x100082);