From 0ecd32cf426510faa00c355f57080e140f6924fb Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 4 Mar 2010 07:54:20 +0000
Subject: [PATCH] [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
---
 .../linux/au1000/patches-2.6.32/001-mtx1_cmdline.patch |  9 +++++++++
 .../patches-2.6.32/006-missing_string_header.patch     | 10 ----------
 2 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 target/linux/au1000/patches-2.6.32/006-missing_string_header.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 a45832765..bbaa88232 100644
--- 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
+@@ -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)
+ 
diff --git a/target/linux/au1000/patches-2.6.32/006-missing_string_header.patch b/target/linux/au1000/patches-2.6.32/006-missing_string_header.patch
deleted file mode 100644
index 8aba20252..000000000
--- a/target/linux/au1000/patches-2.6.32/006-missing_string_header.patch
+++ /dev/null
@@ -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>
- 
-- 
2.35.1