summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDale Farnsworth <dale@farnsworth.org>2006-01-27 01:05:51 -0700
committerJeff Garzik <jgarzik@pobox.com>2006-01-27 11:09:24 -0500
commit6651a5c3839517685c601e44979f19de8b6249c3 (patch)
treef5f16c22d9b0c875b14d40c6311fce89836130b1 /arch
parentb4de9051a98543f121d8dfbf32dd9d5999fb3896 (diff)
downloadkernel-crypto-6651a5c3839517685c601e44979f19de8b6249c3.tar.gz
kernel-crypto-6651a5c3839517685c601e44979f19de8b6249c3.tar.xz
kernel-crypto-6651a5c3839517685c601e44979f19de8b6249c3.zip
[PATCH] mv643xx_eth: Fix for building as a module
Enable mv643xx_eth driver to work when built as a module on mv64x60-based embedded systems. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
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 94ea346b7b4..1f01b7e2376 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