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

PATCH In review Florian Fainelli 3 participants 3 messages Oct 17, 2011 – Nov 2, 2011 MIPS

Share & tools

Florian Fainelli

author

2011-10-17 17:43 UTC #0 lore raw

PATCH 1/1 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.

CC [email protected]

Signed-off-by Florian Fainelli <[email protected]>

---
Greg, this is applicable from 2.6.32+ to 2.6.33+ included.

arch/mips/alchemy/mtx-1/platform.c +0 -9

index 956f946..e30e42a 100644
@@ -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) {

Signature · 1 line

1.7.5.4

Ralf Baechle

Acked-by on v1 1/1

2011-10-21 12:25 UTC #1 lore raw

Quoted 7 lines · 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 [email protected]
Signed-off-by Florian Fainelli <[email protected]>
---
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 <[email protected]>

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

Ralf

Greg KH

2011-11-02 21:14 UTC #2 lore raw

Quoted 10 lines · Ralf Baechle

Quoted 7 lines · 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 [email protected]
Signed-off-by Florian Fainelli <[email protected]>
---
Greg, this is applicable from 2.6.32+ to 2.6.33+ included.

Quoted 5 lines

On 2.6.33-stable the commit ID to be reverted is 34dce55d.
Acked-by Ralf Baechle <[email protected]>
(Or should it be Un-Acked-by: for reverting a patch? ;-)

Heh.

Thanks, I've applied this revert now.

greg k-h