diff -urN RC14-rc2-git8-m68k-8390/arch/ppc/syslib/mv64x60.c RC14-rc2-git8-mv643xx_eth/arch/ppc/syslib/mv64x60.c --- RC14-rc2-git8-m68k-8390/arch/ppc/syslib/mv64x60.c 2005-09-30 07:33:50.000000000 -0400 +++ RC14-rc2-git8-mv643xx_eth/arch/ppc/syslib/mv64x60.c 2005-09-30 07:34:23.000000000 -0400 @@ -312,7 +312,7 @@ }; #endif -#ifdef CONFIG_MV643XX_ETH +#if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MOD) static struct resource mv64x60_eth_shared_resources[] = { [0] = { .name = "ethernet shared base", @@ -455,9 +455,8 @@ &mpsc0_device, &mpsc1_device, #endif -#ifdef CONFIG_MV643XX_ETH +#if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MOD) &mv64x60_eth_shared_device, -#endif #ifdef CONFIG_MV643XX_ETH_0 ð0_device, #endif @@ -467,6 +466,7 @@ #ifdef CONFIG_MV643XX_ETH_2 ð2_device, #endif +#endif #ifdef CONFIG_I2C_MV64XXX &i2c_device, #endif