diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-03-04 07:54:20 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-03-04 07:54:20 +0000 |
| commit | c6c8012c6030558422ee549f3b6ee296506ace77 (patch) | |
| tree | ebc64880e16e0a16141e38640bf56f7b975c2501 /target/linux | |
| parent | 32f6e6c44d0cc4c0ddab7a85b4c6be6ef8485c91 (diff) | |
| download | upstream-c6c8012c6030558422ee549f3b6ee296506ace77.tar.gz upstream-c6c8012c6030558422ee549f3b6ee296506ace77.tar.bz2 upstream-c6c8012c6030558422ee549f3b6ee296506ace77.zip | |
merge the two patches applying to the same file in a single patch
SVN-Revision: 19971
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> - |