| To: | ralf@linux-mips.org, linux-mips@linux-mips.org, Greg KH <gregkh@suse.de> |
|---|---|
| Subject: | [PATCH] Revert "MIPS: MTX-1: Make au1000_eth probe all PHY |
| From: | Florian Fainelli <florian@openwrt.org> |
| Date: | Mon, 17 Oct 2011 19:43:06 +0200 |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:user-agent:mime-version:content-type :content-transfer-encoding:message-id; bh=QEI7NqYxWsPFonW3RDDusrVTC8XzBo5Yh4vrhZ97MyA=; b=mQytI7Iv/IwJYXv0+zLVqMS558Q7urikQGpPzyqpXITdby0Yq/7EPg2Zou2uIyxwWr mRp+iXlNPJSm7TJHXhEXTCoNLgQo8uYAdslV6ED7Lc3Ub8EcN8fXuMiVSKGvuAc4uYdV ui4/kDkn21XAQg1jc07BrJzPH2V42C2BTMhAY= |
| Sender: | linux-mips-bounce@linux-mips.org |
| User-agent: | KMail/1.13.7 (Linux/3.1.0-rc7-amd64; KDE/4.6.5; x86_64; ; ) |
Commit ec3eb823 was not applicable in 2.6.32 and introduces a build breakage.
Revert that commit since it is irrelevant for this kernel version.
CC: stable@kernel.org
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
Greg, this is applicable from 2.6.32+ to 2.6.33+ included.
diff --git a/arch/mips/alchemy/mtx-1/platform.c
b/arch/mips/alchemy/mtx-1/platform.c
index 956f946..e30e42a 100644
--- a/arch/mips/alchemy/mtx-1/platform.c
+++ b/arch/mips/alchemy/mtx-1/platform.c
@@ -28,8 +28,6 @@
#include <linux/mtd/physmap.h>
#include <mtd/mtd-abi.h>
-#include <asm/mach-au1x00/au1xxx_eth.h>
-
static struct gpio_keys_button mtx1_gpio_button[] = {
{
.gpio = 207,
@@ -142,17 +140,10 @@ static struct __initdata platform_device * mtx1_devs[] = {
&mtx1_mtd,
};
-static struct au1000_eth_platform_data mtx1_au1000_eth0_pdata = {
- .phy_search_highest_addr = 1,
- .phy1_search_mac0 = 1,
-};
-
static int __init mtx1_register_devices(void)
{
int rc;
- au1xxx_override_eth_cfg(0, &mtx1_au1000_eth0_pdata);
-
rc = gpio_request(mtx1_gpio_button[0].gpio,
mtx1_gpio_button[0].desc);
if (rc < 0) {
--
1.7.5.4
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: some questions about translation lookaside buffer, loody |
|---|---|
| Next by Date: | Re: YeeLoong / hotkey driver, Paul Roge |
| Previous by Thread: | some questions about translation lookaside buffer, loody |
| Next by Thread: | Re: [PATCH] Revert "MIPS: MTX-1: Make au1000_eth probe all PHY, Ralf Baechle |
| Indexes: | [Date] [Thread] [Top] [All Lists] |