mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[au1000] merge the two patches applying to the same file in a single patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19971 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user