From 62c5d74ed543df1a54cd7404de3c965f43d53a05 Mon Sep 17 00:00:00 2001
From: Dale Farnsworth <dale@farnsworth.org>
Date: Fri, 27 Jan 2006 01:05:51 -0700
Subject: [PATCH] --- yaml --- r: 19063 b: refs/heads/master c:
 6651a5c3839517685c601e44979f19de8b6249c3 h: refs/heads/master i:   19061:
 50fb1636ee21c36609682147305725bc0f20c479   19059:
 138534d48b330842afe2deba4e3aff49ebdb674f   19055:
 e2dc61eb65cbc8f322507b842bb6b0d967e9486b v: v3

---
 [refs]                          | 2 +-
 trunk/arch/ppc/syslib/mv64x60.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 15e6333d021d..4e8df421e51a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4de9051a98543f121d8dfbf32dd9d5999fb3896
+refs/heads/master: 6651a5c3839517685c601e44979f19de8b6249c3
diff --git a/trunk/arch/ppc/syslib/mv64x60.c b/trunk/arch/ppc/syslib/mv64x60.c
index 94ea346b7b4b..1f01b7e2376b 100644
--- a/trunk/arch/ppc/syslib/mv64x60.c
+++ b/trunk/arch/ppc/syslib/mv64x60.c
@@ -313,7 +313,7 @@ static struct platform_device mpsc1_device = {
 };
 #endif
 
-#ifdef CONFIG_MV643XX_ETH
+#if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE)
 static struct resource mv64x60_eth_shared_resources[] = {
 	[0] = {
 		.name	= "ethernet shared base",
@@ -456,7 +456,7 @@ static struct platform_device *mv64x60_pd_devs[] __initdata = {
 	&mpsc0_device,
 	&mpsc1_device,
 #endif
-#ifdef CONFIG_MV643XX_ETH
+#if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE)
 	&mv64x60_eth_shared_device,
 #endif
 #ifdef CONFIG_MV643XX_ETH_0