aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-05 11:23:17 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-11-05 16:00:47 +0100
commitf9c79947b5c4e726ecf5afd1b04d99f0b4101755 (patch)
tree6fc4416f0f7d900b899407a3e16d68794b8bc20c /target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
parent91a8bc1dd06719e9edd3ab0791f5a0f11af836cd (diff)
downloadupstream-f9c79947b5c4e726ecf5afd1b04d99f0b4101755.tar.gz
upstream-f9c79947b5c4e726ecf5afd1b04d99f0b4101755.tar.bz2
upstream-f9c79947b5c4e726ecf5afd1b04d99f0b4101755.zip
kernel: bump 4.14 to 4.14.79
Refreshed all patches. Compile-tested on: cns3xxx, imx6, x86_64 Runtime-tested on: cns3xxx, imx6, x86_64 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch')
-rw-r--r--target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch b/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
index 9419e9916b..5384be15ca 100644
--- a/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
@@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1066,9 +1066,6 @@ config FW_ARC
+@@ -1067,9 +1067,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
-@@ -2966,6 +2963,18 @@ choice
+@@ -2967,6 +2964,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice