| To: | Linux-MIPS <linux-mips@linux-mips.org>, Ralf Baechle <ralf@linux-mips.org> |
|---|---|
| Subject: | [PATCH 2/2] MIPS: Alchemy: fix Au1100 ethernet build failure |
| From: | Manuel Lauss <manuel.lauss@googlemail.com> |
| Date: | Fri, 26 Feb 2010 17:22:02 +0100 |
| Cc: | Manuel Lauss <manuel.lauss@gmail.com> |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=JlWIolN4kAjzBspD4o/okgLbjxHq0S45v8Ux3BX+MB0=; b=rWcHvUpX3ML1ZLF/pJTzlCzwfxDkXqd9YWTf4X+4TToyQrfciGYHArYJlKWvEm+ctu i3Ev0PMYCGBlszxOguHGrYu0tHSjulVdsEun35QQ88UhY89Arqxyzputd51Yy4MjEDIC 4+1Y8VHBu+wTJAMIOe0E55JLSfxRt3BMHOJeg= |
| Domainkey-signature: | a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=vYS1xKIrVBnFFl7Mo+2LblVOcJDHjOEgbVHdM/iHmaeMT45drcQQk9XLU8uJ0CRfSq uho/xeCxRy5+MzjVwNBEPl0Sa4ZSRw8/EH+fGcv4Q7VfAduZrB64SdipGUqHnmcDzkpm zzBbbTPMzRQZpHwn2ndc03z7oBkWvtlbS7LiE= |
| In-reply-to: | <1267201322-28069-1-git-send-email-manuel.lauss@gmail.com> |
| Original-recipient: | rfc822;linux-mips@linux-mips.org |
| References: | <1267201322-28069-1-git-send-email-manuel.lauss@gmail.com> |
| Sender: | linux-mips-bounce@linux-mips.org |
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>
---
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 3fbe30c..2580e77 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[] = {
#endif
};
-static struct resource au1xxx_eth1_resources[] = {
-#if defined(CONFIG_SOC_AU1000)
- MAC_RES(AU1000_ETH1_BASE, AU1000_MAC1_ENABLE, AU1000_MAC1_DMA_INT),
-#elif defined(CONFIG_SOC_AU1550)
- MAC_RES(AU1550_ETH1_BASE, AU1550_MAC1_ENABLE, AU1550_MAC1_DMA_INT),
-#elif defined(CONFIG_SOC_AU1500)
- MAC_RES(AU1500_ETH1_BASE, AU1500_MAC1_ENABLE, AU1500_MAC1_DMA_INT),
-#endif
-};
static struct au1000_eth_platform_data au1xxx_eth0_platform_data = {
.phy1_search_mac0 = 1,
@@ -380,6 +371,16 @@ static struct platform_device au1xxx_eth0_device = {
};
#ifndef CONFIG_SOC_AU1100
+static struct resource au1xxx_eth1_resources[] = {
+#if defined(CONFIG_SOC_AU1000)
+ MAC_RES(AU1000_ETH1_BASE, AU1000_MAC1_ENABLE, AU1000_MAC1_DMA_INT),
+#elif defined(CONFIG_SOC_AU1550)
+ MAC_RES(AU1550_ETH1_BASE, AU1550_MAC1_ENABLE, AU1550_MAC1_DMA_INT),
+#elif defined(CONFIG_SOC_AU1500)
+ MAC_RES(AU1500_ETH1_BASE, AU1500_MAC1_ENABLE, AU1500_MAC1_DMA_INT),
+#endif
+};
+
static struct au1000_eth_platform_data au1xxx_eth1_platform_data = {
.phy1_search_mac0 = 1,
};
--
1.7.0
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH 0/2] MIPS: Alchemy: various build fixes, Manuel Lauss |
|---|---|
| Next by Date: | [PATCH] MIPS: Alchemy: defconfig updates, Manuel Lauss |
| Previous by Thread: | Re: [PATCH 1/2] MIPS: Alchemy: Repair db1500/bosporus builds, Ralf Baechle |
| Next by Thread: | Re: [PATCH 2/2] MIPS: Alchemy: fix Au1100 ethernet build failure, Ralf Baechle |
| Indexes: | [Date] [Thread] [Top] [All Lists] |