KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 19971
This commit is contained in:
Florian Fainelli 2010-03-04 07:54:20 +00:00
parent 32f6e6c44d
commit c6c8012c60
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
target/linux/au1000/patches-2.6.32/001-mtx1_cmdline.patch
View file

@ -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)

10
target/linux/au1000/patches-2.6.32/006-missing_string_header.patch
View file

@ -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>