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

[openwrt.git] / target / linux / au1000 / patches-2.6.32 / 001-mtx1_cmdline.patch

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 a458327..bbaa882 100644 (file)
--- 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
 --- 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;
 @@ -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)
  
        memsize_str = prom_getenv("memsize");
        if (!memsize_str)

+