merge the two patches applying to the same file in a single patch
SVN-Revision: 19971v19.07.3_mercusys_ac12_duma
parent
32f6e6c44d
commit
c6c8012c60
@ -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>
|
|
||||||
|
|
Loading…
Reference in New Issue