summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 10:29:35 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 10:29:35 -0800
commit0827f2b698735aee7cfb2990d393a82f6e1690eb (patch)
tree5eb1fa871154ab36c38794c4dc488698f13c71e0 /arch
parent70b4d63e98fd93fb9742708a54f872cba24e0fea (diff)
parentc6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e (diff)
downloadop-kernel-dev-0827f2b698735aee7cfb2990d393a82f6e1690eb.zip
op-kernel-dev-0827f2b698735aee7cfb2990d393a82f6e1690eb.tar.gz
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc/syslib/mv64x60.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 94ea346..1f01b7e 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/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
OpenPOWER on IntegriCloud