diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-04 07:54:20 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-04 07:54:20 +0000 |
| commit | 0ecd32cf426510faa00c355f57080e140f6924fb (patch) | |
| tree | 274c263ebe0ca8b693406c536ff701611cd56e50 /target/linux | |
| parent | bab04c244dd1758e3376ca1caaad7ca09706d2dc (diff) | |
[au1000] merge the two patches applying to the same file in a single patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19971 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/au1000/patches-2.6.32/001-mtx1_cmdline.patch | 9 | ||||
| -rw-r--r-- | target/linux/au1000/patches-2.6.32/006-missing_string_header.patch | 10 |
2 files changed, 9 insertions, 10 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 a45832765c..bbaa88232a 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 @@ -1,5 +1,13 @@ --- a/arch/mips/alchemy/mtx-1/init.c +++ b/arch/mips/alchemy/mtx-1/init.c +@@ -32,6 +32,7 @@ + #include <linux/init.h> + + #include <asm/bootinfo.h> ++#include <asm/string.h> + + #include <prom.h> + @@ -49,7 +49,7 @@ void __init prom_init(void) prom_argv = (char **)fw_arg1; prom_envp = (char **)fw_arg2; @@ -9,3 +17,4 @@ memsize_str = prom_getenv("memsize"); if (!memsize_str) + diff --git a/target/linux/au1000/patches-2.6.32/006-missing_string_header.patch b/target/linux/au1000/patches-2.6.32/006-missing_string_header.patch deleted file mode 100644 index 8aba202521..0000000000 --- a/target/linux/au1000/patches-2.6.32/006-missing_string_header.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/mips/alchemy/mtx-1/init.c -+++ b/arch/mips/alchemy/mtx-1/init.c -@@ -32,6 +32,7 @@ - #include <linux/init.h> - - #include <asm/bootinfo.h> -+#include <asm/string.h> - - #include <prom.h> - |