diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-12-04 14:48:54 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-12-04 14:48:54 +0000 |
| commit | 7d19cf119af2b7cef089b8906134d018ec4b9628 (patch) | |
| tree | 4dfd42dac0ad81981c14cc2ec96222a8c8beb105 /target/linux/au1000 | |
| parent | 81beea29251b604a5ca842a0698348c15758a22a (diff) | |
| download | master-187ad058-7d19cf119af2b7cef089b8906134d018ec4b9628.tar.gz master-187ad058-7d19cf119af2b7cef089b8906134d018ec4b9628.tar.bz2 master-187ad058-7d19cf119af2b7cef089b8906134d018ec4b9628.zip | |
[au1000] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13513 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/au1000')
6 files changed, 13 insertions, 17 deletions
diff --git a/target/linux/au1000/patches-2.6.27/001-mtx1_cmdline.patch b/target/linux/au1000/patches-2.6.27/001-mtx1_cmdline.patch index a41ee6f21d..cace58d2c9 100644 --- a/target/linux/au1000/patches-2.6.27/001-mtx1_cmdline.patch +++ b/target/linux/au1000/patches-2.6.27/001-mtx1_cmdline.patch @@ -1,8 +1,8 @@ --- a/arch/mips/au1000/mtx-1/init.c +++ b/arch/mips/au1000/mtx-1/init.c -@@ -54,7 +54,7 @@ void __init prom_init(void) - prom_argv = (char **) fw_arg1; - prom_envp = (char **) fw_arg2; +@@ -49,7 +49,7 @@ void __init prom_init(void) + prom_argv = (char **)fw_arg1; + prom_envp = (char **)fw_arg2; - prom_init_cmdline(); + strcpy(arcs_cmdline, CONFIG_CMDLINE); diff --git a/target/linux/au1000/patches-2.6.27/002-openwrt_rootfs.patch b/target/linux/au1000/patches-2.6.27/002-openwrt_rootfs.patch index 00cda2561c..ade30a6740 100644 --- a/target/linux/au1000/patches-2.6.27/002-openwrt_rootfs.patch +++ b/target/linux/au1000/patches-2.6.27/002-openwrt_rootfs.patch @@ -1,7 +1,6 @@ -diff -urN linux-2.6.27.5/arch/mips/au1000/mtx-1/platform.c linux-2.6.27.5.new/arch/mips/au1000/mtx-1/platform.c ---- linux-2.6.27.5/arch/mips/au1000/mtx-1/platform.c 2008-11-07 18:55:34.000000000 +0100 -+++ linux-2.6.27.5.new/arch/mips/au1000/mtx-1/platform.c 2008-11-15 15:33:31.000000000 +0100 -@@ -90,7 +90,7 @@ +--- a/arch/mips/au1000/mtx-1/platform.c ++++ b/arch/mips/au1000/mtx-1/platform.c +@@ -90,7 +90,7 @@ static struct platform_device mtx1_gpio_ static struct mtd_partition mtx1_mtd_partitions[] = { { diff --git a/target/linux/au1000/patches-2.6.27/003-au1000_eth_ioctl.patch b/target/linux/au1000/patches-2.6.27/003-au1000_eth_ioctl.patch index 935898159f..4b152f3aad 100644 --- a/target/linux/au1000/patches-2.6.27/003-au1000_eth_ioctl.patch +++ b/target/linux/au1000/patches-2.6.27/003-au1000_eth_ioctl.patch @@ -1,6 +1,6 @@ --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c -@@ -1306,9 +1306,12 @@ static void set_rx_mode(struct net_devic +@@ -1293,9 +1293,12 @@ static void set_rx_mode(struct net_devic } } diff --git a/target/linux/au1000/patches-2.6.27/004-state_led_phy_fix.patch b/target/linux/au1000/patches-2.6.27/004-state_led_phy_fix.patch index 3e5a4ebf01..e681970c5b 100644 --- a/target/linux/au1000/patches-2.6.27/004-state_led_phy_fix.patch +++ b/target/linux/au1000/patches-2.6.27/004-state_led_phy_fix.patch @@ -1,6 +1,6 @@ ---- linux-2.6.27/drivers/net/au1000_eth.c 2008-10-18 22:37:52.000000000 +0200 -+++ linux-2.6.27.new/drivers/net/au1000_eth.c 2008-11-02 22:03:14.000000000 +0100 -@@ -187,6 +187,15 @@ +--- a/drivers/net/au1000_eth.c ++++ b/drivers/net/au1000_eth.c +@@ -184,6 +184,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 -@@ -383,6 +392,12 @@ +@@ -380,6 +389,12 @@ static int mii_probe (struct net_device aup->old_duplex = -1; aup->phy_dev = phydev; diff --git a/target/linux/au1000/patches-2.6.27/005-mtx1_wdt_fix.patch b/target/linux/au1000/patches-2.6.27/005-mtx1_wdt_fix.patch index 0b0fc02efd..3a365900ff 100644 --- a/target/linux/au1000/patches-2.6.27/005-mtx1_wdt_fix.patch +++ b/target/linux/au1000/patches-2.6.27/005-mtx1_wdt_fix.patch @@ -1,5 +1,3 @@ -diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c -index b4b7b0a..3acce62 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c @@ -98,6 +98,8 @@ static void mtx1_wdt_reset(void) @@ -20,4 +18,3 @@ index b4b7b0a..3acce62 100644 spin_lock_irqsave(&mtx1_wdt_device.lock, flags); if (mtx1_wdt_device.queue) { mtx1_wdt_device.queue = 0; - diff --git a/target/linux/au1000/patches-2.6.27/006-missing_string_header.patch b/target/linux/au1000/patches-2.6.27/006-missing_string_header.patch index ed8a0bebe7..bff8b572bb 100644 --- a/target/linux/au1000/patches-2.6.27/006-missing_string_header.patch +++ b/target/linux/au1000/patches-2.6.27/006-missing_string_header.patch @@ -1,5 +1,5 @@ ---- linux-2.6.27.5/arch/mips/au1000/mtx-1/init.c 2008-11-07 18:55:34.000000000 +0100 -+++ linux-2.6.27.5.new/arch/mips/au1000/mtx-1/init.c 2008-11-15 16:09:47.000000000 +0100 +--- a/arch/mips/au1000/mtx-1/init.c ++++ b/arch/mips/au1000/mtx-1/init.c @@ -32,6 +32,7 @@ #include <linux/init.h> |