]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Revert "MIPS: MTX-1: Make au1000_eth probe all PHY
authorFlorian Fainelli <florian@openwrt.org>
Mon, 17 Oct 2011 17:43:06 +0000 (19:43 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 7 Nov 2011 20:32:44 +0000 (12:32 -0800)
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>
arch/mips/alchemy/mtx-1/platform.c

index 956f946218c519eb3b1c86cf76540150eac244e7..e30e42add697ef728d0180cd0ea25d9414ee53d2 100644 (file)
@@ -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) {