diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 11:39:30 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 11:39:30 +0000 |
| commit | 53c72485542f0a49df005b240a1388218c7cf328 (patch) | |
| tree | 2992d344fec18dd6d33d4b6d75ca7d4aa188ba00 /target/linux | |
| parent | 1aad0e6878ad10ef2caa92af8d2b353da186ca4a (diff) | |
| download | upstream-53c72485542f0a49df005b240a1388218c7cf328.tar.gz upstream-53c72485542f0a49df005b240a1388218c7cf328.tar.bz2 upstream-53c72485542f0a49df005b240a1388218c7cf328.zip | |
generic/3.18: update to 3.18.3
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44121
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/patches-3.18/997-device_tree_cmdline.patch | 16 |
1 files changed, 6 insertions, 10 deletions
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) { |