diff options
author | Dale Farnsworth <dale@farnsworth.org> | 2007-02-20 05:15:20 -0700 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-02-20 17:11:55 +0000 |
commit | f00a3ec4d47b51c5995fe10f8252a90aca331e62 (patch) | |
tree | a66ca09ec8611e637344acd6e410b4f6207b243a /arch/mips/momentum/ocelot_3/platform.c | |
parent | a0be2f7999aaff97962fe4240ab2ca12a394884c (diff) |
[NET] Eliminate user-selectable CONFIG_MV643XX_ETH_[012]
Remove the use of CONFIG_MV643XX_ETH_[012] variables on most platforms.
Instead, platform-specific code enables the ports supported by the
hardware. After this patch, these config variables are only used in
arch/ppc, so also move them from drivers/net/Kconfig to arch/ppc/Kconfig.
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Jeff Garzik <jeff@garzik.org>
Cc: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/mips/momentum/ocelot_3/platform.c')
-rw-r--r-- | arch/mips/momentum/ocelot_3/platform.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/mips/momentum/ocelot_3/platform.c b/arch/mips/momentum/ocelot_3/platform.c index 57cfe5c6e4a..0ab8d231cf7 100644 --- a/arch/mips/momentum/ocelot_3/platform.c +++ b/arch/mips/momentum/ocelot_3/platform.c @@ -38,8 +38,6 @@ static struct platform_device mv643xx_eth_shared_device = { #define MV64x60_IRQ_ETH_1 49 #define MV64x60_IRQ_ETH_2 50 -#ifdef CONFIG_MV643XX_ETH_0 - static struct resource mv64x60_eth0_resources[] = { [0] = { .name = "eth0 irq", @@ -72,9 +70,6 @@ static struct platform_device eth0_device = { .platform_data = ð0_pd, }, }; -#endif /* CONFIG_MV643XX_ETH_0 */ - -#ifdef CONFIG_MV643XX_ETH_1 static struct resource mv64x60_eth1_resources[] = { [0] = { @@ -108,9 +103,6 @@ static struct platform_device eth1_device = { .platform_data = ð1_pd, }, }; -#endif /* CONFIG_MV643XX_ETH_1 */ - -#ifdef CONFIG_MV643XX_ETH_2 static struct resource mv64x60_eth2_resources[] = { [0] = { @@ -136,19 +128,12 @@ static struct platform_device eth2_device = { .platform_data = ð2_pd, }, }; -#endif /* CONFIG_MV643XX_ETH_2 */ static struct platform_device *mv643xx_eth_pd_devs[] __initdata = { &mv643xx_eth_shared_device, -#ifdef CONFIG_MV643XX_ETH_0 ð0_device, -#endif -#ifdef CONFIG_MV643XX_ETH_1 ð1_device, -#endif -#ifdef CONFIG_MV643XX_ETH_2 ð2_device, -#endif }; static u8 __init exchange_bit(u8 val, u8 cs) @@ -215,15 +200,9 @@ static int __init mv643xx_eth_add_pds(void) int ret; get_mac(mac); -#ifdef CONFIG_MV643XX_ETH_0 eth_mac_add(eth1_mac_addr, mac, 0); -#endif -#ifdef CONFIG_MV643XX_ETH_1 eth_mac_add(eth1_mac_addr, mac, 1); -#endif -#ifdef CONFIG_MV643XX_ETH_2 eth_mac_add(eth2_mac_addr, mac, 2); -#endif ret = platform_add_devices(mv643xx_eth_pd_devs, ARRAY_SIZE(mv643xx_eth_pd_devs)); |