Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / arch / mips / momentum / ocelot_c / platform.c

diff --git a/arch/mips/momentum/ocelot_c/platform.c b/arch/mips/momentum/ocelot_c/platform.c
index 6c495b2..8e381d4 100644 (file)
--- a/arch/mips/momentum/ocelot_c/platform.c
+++ b/arch/mips/momentum/ocelot_c/platform.c
@@ -37,8 +37,6 @@ static struct platform_device mv643xx_eth_shared_device = {
 #define MV64x60_IRQ_ETH_0 48
 #define MV64x60_IRQ_ETH_1 49
 
-#ifdef CONFIG_MV643XX_ETH_0
-
 static struct resource mv64x60_eth0_resources[] = {
        [0] = {
                .name   = "eth0 irq",
@@ -71,9 +69,6 @@ static struct platform_device eth0_device = {
                .platform_data = &eth0_pd,
        },
 };
-#endif /* CONFIG_MV643XX_ETH_0 */
-
-#ifdef CONFIG_MV643XX_ETH_1
 
 static struct resource mv64x60_eth1_resources[] = {
        [0] = {
@@ -107,16 +102,11 @@ static struct platform_device eth1_device = {
                .platform_data = &eth1_pd,
        },
 };
-#endif /* CONFIG_MV643XX_ETH_1 */
 
 static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
        &mv643xx_eth_shared_device,
-#ifdef CONFIG_MV643XX_ETH_0
        &eth0_device,
-#endif
-#ifdef CONFIG_MV643XX_ETH_1
        &eth1_device,
-#endif
        /* The third port is not wired up on the Ocelot C */
 };
 
@@ -184,12 +174,8 @@ 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
        ret = platform_add_devices(mv643xx_eth_pd_devs,
                        ARRAY_SIZE(mv643xx_eth_pd_devs));