aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/au1000/patches-2.6.32
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
commite66a368bd1c068d50e24bd906cfc6ef7009f7580 (patch)
tree62821cf6f2450be73a617420cf7e4b46f2641232 /target/linux/au1000/patches-2.6.32
parent797967480c2ec11fb788972de03cb35f076f95eb (diff)
downloadupstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.tar.gz
upstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.tar.bz2
upstream-e66a368bd1c068d50e24bd906cfc6ef7009f7580.zip
kernel: update to 2.6.32.10
SVN-Revision: 20444
Diffstat (limited to 'target/linux/au1000/patches-2.6.32')
-rw-r--r--target/linux/au1000/patches-2.6.32/001-mtx1_cmdline.patch3
-rw-r--r--target/linux/au1000/patches-2.6.32/003-au1000_eth_ioctl.patch2
-rw-r--r--target/linux/au1000/patches-2.6.32/004-state_led_phy_fix.patch4
3 files changed, 4 insertions, 5 deletions
diff --git a/target/linux/au1000/patches-2.6.32/001-mtx1_cmdline.patch b/target/linux/au1000/patches-2.6.32/001-mtx1_cmdline.patch
index bbaa88232a..d00cbc73b8 100644
--- a/target/linux/au1000/patches-2.6.32/001-mtx1_cmdline.patch
+++ b/target/linux/au1000/patches-2.6.32/001-mtx1_cmdline.patch
@@ -8,7 +8,7 @@
#include <prom.h>
-@@ -49,7 +49,7 @@ void __init prom_init(void)
+@@ -49,7 +50,7 @@ void __init prom_init(void)
prom_argv = (char **)fw_arg1;
prom_envp = (char **)fw_arg2;
@@ -17,4 +17,3 @@
memsize_str = prom_getenv("memsize");
if (!memsize_str)
-
diff --git a/target/linux/au1000/patches-2.6.32/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches-2.6.32/003-au1000_eth_ioctl.patch
index 9bda9a3fe5..2665029764 100644
--- a/target/linux/au1000/patches-2.6.32/003-au1000_eth_ioctl.patch
+++ b/target/linux/au1000/patches-2.6.32/003-au1000_eth_ioctl.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
-@@ -1036,10 +1036,14 @@ static void au1000_multicast_list(struct
+@@ -1035,10 +1035,14 @@ static void au1000_multicast_list(struct
}
}
diff --git a/target/linux/au1000/patches-2.6.32/004-state_led_phy_fix.patch b/target/linux/au1000/patches-2.6.32/004-state_led_phy_fix.patch
index cfaea00e28..66b511b400 100644
--- a/target/linux/au1000/patches-2.6.32/004-state_led_phy_fix.patch
+++ b/target/linux/au1000/patches-2.6.32/004-state_led_phy_fix.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
-@@ -166,6 +166,15 @@ struct au1000_private *au_macs[NUM_ETH_I
+@@ -167,6 +167,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
-@@ -483,6 +492,12 @@ static int mii_probe (struct net_device
+@@ -484,6 +493,12 @@ static int mii_probe (struct net_device
aup->old_duplex = -1;
aup->phy_dev = phydev;