X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.18%2F997-device_tree_cmdline.patch;fp=target%2Flinux%2Fgeneric%2Fpatches-3.18%2F997-device_tree_cmdline.patch;h=dd725b01b1230baeb6f4ecaa5fafddebb3c8871c;hp=b3aa1d1966745a87bb82587b8f43b6931d7de174;hb=4a96c98400a692dec9ee3906282f324a3c4718d9;hpb=e37225d93766a50fd3b186bbf5eea583316aff05

diff --git a/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch b/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
index b3aa1d1966..dd725b01b1 100644
--- a/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
+++ b/target/linux/generic/patches-3.18/997-device_tree_cmdline.patch
@@ -1,8 +1,6 @@
-Index: linux-3.18.2/drivers/of/fdt.c
-===================================================================
---- linux-3.18.2.orig/drivers/of/fdt.c	2015-01-17 20:57:52.419074654 -0800
-+++ linux-3.18.2/drivers/of/fdt.c	2015-01-17 20:57:52.367074398 -0800
-@@ -903,6 +903,9 @@
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -903,6 +903,9 @@ int __init early_init_dt_scan_chosen(uns
  	p = of_get_flat_dt_prop(node, "bootargs", &l);
  	if (p != NULL && l > 0)
  		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
@@ -12,11 +10,9 @@ Index: linux-3.18.2/drivers/of/fdt.c
  
  	/*
  	 * CONFIG_CMDLINE is meant to be a default in case nothing else
-Index: linux-3.18.2/arch/mips/kernel/prom.c
-===================================================================
---- linux-3.18.2.orig/arch/mips/kernel/prom.c	2015-01-17 20:57:52.419074654 -0800
-+++ linux-3.18.2/arch/mips/kernel/prom.c	2015-01-17 20:57:52.415074633 -0800
-@@ -49,6 +49,9 @@
+--- a/arch/mips/kernel/prom.c
++++ b/arch/mips/kernel/prom.c
+@@ -49,6 +49,9 @@ void * __init early_init_dt_alloc_memory
  
  void __init __dt_setup_arch(void *bph)
  {