[au1000] merge the two patches applying to the same file in a single patch
[openwrt-10.03/.git] / target / linux / au1000 / patches-2.6.32 / 001-mtx1_cmdline.patch
1 --- a/arch/mips/alchemy/mtx-1/init.c
2 +++ b/arch/mips/alchemy/mtx-1/init.c
3 @@ -32,6 +32,7 @@
4  #include <linux/init.h>
5  
6  #include <asm/bootinfo.h>
7 +#include <asm/string.h>
8  
9  #include <prom.h>
10  
11 @@ -49,7 +49,7 @@ void __init prom_init(void)
12         prom_argv = (char **)fw_arg1;
13         prom_envp = (char **)fw_arg2;
14  
15 -       prom_init_cmdline();
16 +       strcpy(arcs_cmdline, CONFIG_CMDLINE);
17  
18         memsize_str = prom_getenv("memsize");
19         if (!memsize_str)
20