aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/au1000/patches
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-02-03 19:49:50 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-02-03 19:49:50 +0000
commitcda3fd524a18662e3fdcded0c76923f9fdf06a9b (patch)
tree7ce034810c5f34699ff45480d71ae37a09fee4bc /target/linux/au1000/patches
parent62c655ab64989ffa26416bab8935908d4b610997 (diff)
downloadupstream-cda3fd524a18662e3fdcded0c76923f9fdf06a9b.tar.gz
upstream-cda3fd524a18662e3fdcded0c76923f9fdf06a9b.tar.bz2
upstream-cda3fd524a18662e3fdcded0c76923f9fdf06a9b.zip
Upgrade au1000 to .24
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10377 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/au1000/patches')
-rw-r--r--target/linux/au1000/patches/012-mtx1_cmdline.patch8
-rw-r--r--target/linux/au1000/patches/016-watchdog_pdev_gpio.patch6
2 files changed, 3 insertions, 11 deletions
diff --git a/target/linux/au1000/patches/012-mtx1_cmdline.patch b/target/linux/au1000/patches/012-mtx1_cmdline.patch
index 8f078428c4..14b8e746ec 100644
--- a/target/linux/au1000/patches/012-mtx1_cmdline.patch
+++ b/target/linux/au1000/patches/012-mtx1_cmdline.patch
@@ -1,13 +1,5 @@
--- linux-2.6.19.2/arch/mips/au1000/mtx-1/init.c.old 2007-04-06 15:01:13.503777992 +0200
+++ linux-2.6.19.2/arch/mips/au1000/mtx-1/init.c 2007-04-06 15:01:36.296313000 +0200
-@@ -39,7 +39,6 @@
-
- int prom_argc;
- char **prom_argv, **prom_envp;
--extern void __init prom_init_cmdline(void);
- extern char *prom_getenv(char *envname);
-
- const char *get_system_type(void)
@@ -59,7 +58,7 @@
mips_machgroup = MACH_GROUP_ALCHEMY;
mips_machtype = MACH_MTX1; /* set the platform # */
diff --git a/target/linux/au1000/patches/016-watchdog_pdev_gpio.patch b/target/linux/au1000/patches/016-watchdog_pdev_gpio.patch
index ea162f1749..321563ac1d 100644
--- a/target/linux/au1000/patches/016-watchdog_pdev_gpio.patch
+++ b/target/linux/au1000/patches/016-watchdog_pdev_gpio.patch
@@ -1,7 +1,7 @@
-diff --git a/drivers/char/watchdog/mtx-1_wdt.c b/drivers/char/watchdog/mtx-1_wdt.c
+diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index dcfd401..5d8c51f 100644
---- a/drivers/char/watchdog/mtx-1_wdt.c
-+++ b/drivers/char/watchdog/mtx-1_wdt.c
+--- a/drivers/watchdog/mtx-1_wdt.c
++++ b/drivers/watchdog/mtx-1_wdt.c
@@ -45,10 +45,13 @@
#include <linux/completion.h>
#include <linux/jiffies.h>