summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-10-17 19:43:06 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-07 12:32:44 -0800
commit0804bd48bb9787acf5ae7d2f155fdea11d198018 (patch)
tree21fef93227b6da55e4e81aa3d8ec3d129b9f9c46
parentabd2ed99e8e0cf1481e7133e90587128e79fd689 (diff)
downloadlwn-0804bd48bb9787acf5ae7d2f155fdea11d198018.tar.gz
lwn-0804bd48bb9787acf5ae7d2f155fdea11d198018.zip
Revert "MIPS: MTX-1: Make au1000_eth probe all PHY
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. Acked-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Florian Fainelli <florian@openwrt.org>
-rw-r--r--arch/mips/alchemy/mtx-1/platform.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/mips/alchemy/mtx-1/platform.c b/arch/mips/alchemy/mtx-1/platform.c
index 956f946218c5..e30e42add697 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) {