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>2019-09-20 15:09:54 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-09-20 15:52:54 +0200
commit7e1db8f27c919c00aed74cc3981e025ac9f887ec (patch)
treefccf6da8d592063089b8e1544d1ece84a4beef12 /target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch
parentd32cf526742d151ec7ae593e64cc9040068dc536 (diff)
downloadupstream-7e1db8f27c919c00aed74cc3981e025ac9f887ec.tar.gz
upstream-7e1db8f27c919c00aed74cc3981e025ac9f887ec.tar.bz2
upstream-7e1db8f27c919c00aed74cc3981e025ac9f887ec.zip
kernel: bump 4.14 to 4.14.145
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx 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 35854f323c..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
-@@ -1070,9 +1070,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
-@@ -2970,6 +2967,18 @@ choice
+@@ -2967,6 +2964,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice