diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-01 10:07:32 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-10-01 10:07:32 +0000 |
| commit | 61a476da4d61774ee01624726fe1bee786f7cf8e (patch) | |
| tree | 8156c94dfbaf686c6f4d07abf0a898ddc3c3d51c /target/linux/au1000 | |
| parent | 5149fca5d2e7b383d970266d20d2c16b5334a30b (diff) | |
kernel: upgrade to 2.6.30.8 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17804 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/au1000')
4 files changed, 9 insertions, 13 deletions
diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index 9c22db852..2ef03b32e 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.30.7 +LINUX_VERSION:=2.6.30.8 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += hostapd-mini yamonenv 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 db52b0fd7..9bda9a3fe 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 e681970c5..cfaea00e2 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 1e09b1987..c0c6a22cf 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) { |