merge the two patches applying to the same file in a single patch

SVN-Revision: 19971
2010-03-04 07:54:20 +00:00 · 2010-03-04 07:54:20 +00:00 · c6c8012c60
parent 32f6e6c44d
commit c6c8012c60
2 changed files with 9 additions and 10 deletions
--- 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)
+ 
--- 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
@ -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>
-