summaryrefslogtreecommitdiff
path: root/target/linux/au1000/patches-2.6.30
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-10-01 10:07:32 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-10-01 10:07:32 +0000
commit054c54512f1120f037142964b0e51190d11b8904 (patch)
tree739640bd2b5935e5efdaa70d2e3208ae8a3775af /target/linux/au1000/patches-2.6.30
parentb2334452229f1ac2e246f37452b9611f3dab159e (diff)
downloadmtk-20170518-054c54512f1120f037142964b0e51190d11b8904.zip
mtk-20170518-054c54512f1120f037142964b0e51190d11b8904.tar.gz
mtk-20170518-054c54512f1120f037142964b0e51190d11b8904.tar.bz2
kernel: upgrade to 2.6.30.8 and refresh patches
SVN-Revision: 17804
Diffstat (limited to 'target/linux/au1000/patches-2.6.30')
-rw-r--r--target/linux/au1000/patches-2.6.30/003-au1000_eth_ioctl.patch8
-rw-r--r--target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch8
-rw-r--r--target/linux/au1000/patches-2.6.30/007-gpio_request_button.patch4
3 files changed, 8 insertions, 12 deletions
diff --git a/target/linux/au1000/patches-2.6.30/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches-2.6.30/003-au1000_eth_ioctl.patch
index db52b0f..9bda9a3 100644
--- a/target/linux/au1000/patches-2.6.30/003-au1000_eth_ioctl.patch
+++ b/target/linux/au1000/patches-2.6.30/003-au1000_eth_ioctl.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.30.1/drivers/net/au1000_eth.c
-===================================================================
---- linux-2.6.30.1.orig/drivers/net/au1000_eth.c 2009-07-03 01:52:38.000000000 +0200
-+++ linux-2.6.30.1/drivers/net/au1000_eth.c 2009-07-18 12:26:58.000000000 +0200
-@@ -1036,10 +1036,14 @@
+--- a/drivers/net/au1000_eth.c
++++ b/drivers/net/au1000_eth.c
+@@ -1036,10 +1036,14 @@ static void au1000_multicast_list(struct
}
}
diff --git a/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch b/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch
index e681970..cfaea00 100644
--- a/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch
+++ b/target/linux/au1000/patches-2.6.30/004-state_led_phy_fix.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
-@@ -184,6 +184,15 @@ struct au1000_private *au_macs[NUM_ETH_I
+@@ -166,6 +166,15 @@ struct au1000_private *au_macs[NUM_ETH_I
# undef AU1XXX_PHY1_IRQ
#endif
@@ -16,7 +16,7 @@
#if defined(AU1XXX_PHY0_BUSID) && (AU1XXX_PHY0_BUSID > 0)
# error MAC0-associated PHY attached 2nd MACs MII bus not supported yet
#endif
-@@ -380,6 +389,12 @@ static int mii_probe (struct net_device
+@@ -483,6 +492,12 @@ static int mii_probe (struct net_device
aup->old_duplex = -1;
aup->phy_dev = phydev;
@@ -27,5 +27,5 @@
+#endif
+
printk(KERN_INFO "%s: attached PHY driver [%s] "
- "(mii_bus:phy_addr=%s, irq=%d)\n",
- dev->name, phydev->drv->name, phydev->dev.bus_id, phydev->irq);
+ "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name,
+ phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
diff --git a/target/linux/au1000/patches-2.6.30/007-gpio_request_button.patch b/target/linux/au1000/patches-2.6.30/007-gpio_request_button.patch
index 1e09b19..c0c6a22 100644
--- a/target/linux/au1000/patches-2.6.30/007-gpio_request_button.patch
+++ b/target/linux/au1000/patches-2.6.30/007-gpio_request_button.patch
@@ -1,5 +1,3 @@
-diff --git a/arch/mips/alchemy/mtx-1/platform.c b/arch/mips/alchemy/mtx-1/platform.c
-index 8b5914d..e30e42a 100644
--- a/arch/mips/alchemy/mtx-1/platform.c
+++ b/arch/mips/alchemy/mtx-1/platform.c
@@ -1,7 +1,7 @@
@@ -11,7 +9,7 @@ index 8b5914d..e30e42a 100644
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
-@@ -142,7 +142,17 @@ static struct __initdata platform_device * mtx1_devs[] = {
+@@ -142,7 +142,17 @@ static struct __initdata platform_device
static int __init mtx1_register_devices(void)
{