qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19971 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian
2010-03-04 07:54:20 +00:00
parent bab04c244d
commit 0ecd32cf42
2 changed files with 9 additions and 10 deletions
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 --- a/arch/mips/alchemy/mtx-1/init.c
+++ b/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) @@ -49,7 +49,7 @@ void __init prom_init(void)
prom_argv = (char **)fw_arg1; prom_argv = (char **)fw_arg1;
prom_envp = (char **)fw_arg2; prom_envp = (char **)fw_arg2;
@@ -9,3 +17,4 @@
memsize_str = prom_getenv("memsize"); memsize_str = prom_getenv("memsize");
if (!memsize_str) 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>