diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-26 10:45:25 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-26 10:45:25 +0000 |
| commit | b4fcbf11143527779d5e6e99a32d509dd175695d (patch) | |
| tree | 1ebdd84043c3a394d84a147696f72821da570290 /target/linux/au1000 | |
| parent | dc7ecbe1546a80a523a592b0587566067d36490a (diff) | |
kernel: update to 2.6.32.10
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20444 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/au1000')
4 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index 295030745a..f9011b2273 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=RMI/AMD AU1x00 FEATURES:=jffs2 usb pci SUBTARGETS=au1500 au1550 -LINUX_VERSION:=2.6.32.9 +LINUX_VERSION:=2.6.32.10 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv 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; |