diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2010-02-26 11:22:02 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 06:53:45 -0500 |
commit | acc4d245a70615755cab8bace7f0f87870fc99d9 (patch) | |
tree | 1a7824d2f7fb2337451a12e7007f25788d3f1cf1 /arch/mips | |
parent | 570cb456efbd1f1e761869881ae72177595de356 (diff) |
MIPS: Alchemy: Fix Au1100 ethernet build failure
Don't define platform info for second mac on au1100 (which only has a
single mac).
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/1004/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/alchemy/common/platform.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c index 3fbe30c1fd9a..2580e77624d2 100644 --- a/arch/mips/alchemy/common/platform.c +++ b/arch/mips/alchemy/common/platform.c | |||
@@ -357,15 +357,6 @@ static struct resource au1xxx_eth0_resources[] = { | |||
357 | #endif | 357 | #endif |
358 | }; | 358 | }; |
359 | 359 | ||
360 | static struct resource au1xxx_eth1_resources[] = { | ||
361 | #if defined(CONFIG_SOC_AU1000) | ||
362 | MAC_RES(AU1000_ETH1_BASE, AU1000_MAC1_ENABLE, AU1000_MAC1_DMA_INT), | ||
363 | #elif defined(CONFIG_SOC_AU1550) | ||
364 | MAC_RES(AU1550_ETH1_BASE, AU1550_MAC1_ENABLE, AU1550_MAC1_DMA_INT), | ||
365 | #elif defined(CONFIG_SOC_AU1500) | ||
366 | MAC_RES(AU1500_ETH1_BASE, AU1500_MAC1_ENABLE, AU1500_MAC1_DMA_INT), | ||
367 | #endif | ||
368 | }; | ||
369 | 360 | ||
370 | static struct au1000_eth_platform_data au1xxx_eth0_platform_data = { | 361 | static struct au1000_eth_platform_data au1xxx_eth0_platform_data = { |
371 | .phy1_search_mac0 = 1, | 362 | .phy1_search_mac0 = 1, |
@@ -380,6 +371,16 @@ static struct platform_device au1xxx_eth0_device = { | |||
380 | }; | 371 | }; |
381 | 372 | ||
382 | #ifndef CONFIG_SOC_AU1100 | 373 | #ifndef CONFIG_SOC_AU1100 |
374 | static struct resource au1xxx_eth1_resources[] = { | ||
375 | #if defined(CONFIG_SOC_AU1000) | ||
376 | MAC_RES(AU1000_ETH1_BASE, AU1000_MAC1_ENABLE, AU1000_MAC1_DMA_INT), | ||
377 | #elif defined(CONFIG_SOC_AU1550) | ||
378 | MAC_RES(AU1550_ETH1_BASE, AU1550_MAC1_ENABLE, AU1550_MAC1_DMA_INT), | ||
379 | #elif defined(CONFIG_SOC_AU1500) | ||
380 | MAC_RES(AU1500_ETH1_BASE, AU1500_MAC1_ENABLE, AU1500_MAC1_DMA_INT), | ||
381 | #endif | ||
382 | }; | ||
383 | |||
383 | static struct au1000_eth_platform_data au1xxx_eth1_platform_data = { | 384 | static struct au1000_eth_platform_data au1xxx_eth1_platform_data = { |
384 | .phy1_search_mac0 = 1, | 385 | .phy1_search_mac0 = 1, |
385 | }; | 386 | }; |