[PATCH] Revert "MIPS: MTX-1: Make au1000_eth probe all PHY

[PATCH] Revert "MIPS: MTX-1: Make au1000_eth probe all PHY

[Florian Fainelli]

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

Re: [PATCH] Revert "MIPS: MTX-1: Make au1000_eth probe all PHY

[Ralf Baechle]

On Mon, Oct 17, 2011 at 07:43:06PM +0200, Florian Fainelli wrote:

> 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.

On 2.6.33-stable the commit ID to be reverted is 34dce55d.

Acked-by: Ralf Baechle <ralf@linux-mips.org>

(Or should it be Un-Acked-by: for reverting a patch?  ;-)

  Ralf

Re: [PATCH] Revert "MIPS: MTX-1: Make au1000_eth probe all PHY

[Greg KH]

On Fri, Oct 21, 2011 at 01:25:49PM +0100, Ralf Baechle wrote:
> On Mon, Oct 17, 2011 at 07:43:06PM +0200, Florian Fainelli wrote:
> 
> > 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.
> 
> On 2.6.33-stable the commit ID to be reverted is 34dce55d.
> 
> Acked-by: Ralf Baechle <ralf@linux-mips.org>
> 
> (Or should it be Un-Acked-by: for reverting a patch?  ;-)

Heh.

Thanks, I've applied this revert now.

greg k-h