aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-06-05 01:06:28 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-06 17:57:39 +0200
commitccc505502e93f6f3b0e7a7288f15dd7a03e85f5b (patch)
treee3f91606873495ec492602ef6ec636243391654e /target/linux/lantiq
parent1153773c78d39d518b592f7b77180f370bcd4a60 (diff)
downloadupstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.tar.gz
upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.tar.bz2
upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.zip
kernel: bump 4.14 to 4.14.235
Manually rebased ramips/patches-5.4/0048-asoc-add-mt7620-support.patch All others updated automatically. Compile-tested on: ath79/generic, ramips/mt7621 Runtime-tested on: ath79/generic Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch
index 671577f584..071f166a1d 100644
--- a/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch
+++ b/target/linux/lantiq/patches-4.14/0001-MIPS-lantiq-add-pcie-driver.patch
@@ -4143,7 +4143,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+
--- a/arch/mips/pci/pci-legacy.c
+++ b/arch/mips/pci/pci-legacy.c
-@@ -313,3 +313,30 @@ char *__init pcibios_setup(char *str)
+@@ -318,3 +318,30 @@ char *__init pcibios_setup(char *str)
return pcibios_plat_setup(str);
return str;
}