aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mpc85xx
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-28 11:03:25 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-28 18:17:32 +0100
commit3662157d8beda32d95fdc039da0b8114c0c2bb7b (patch)
tree0ffeb568ffc471b47e3633e736e1e801676ef066 /target/linux/mpc85xx
parent662b92614699164396aa38b18f4510333ba64f1d (diff)
downloadupstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.tar.gz
upstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.tar.bz2
upstream-3662157d8beda32d95fdc039da0b8114c0c2bb7b.zip
kernel: bump 4.14 to 4.14.96
Refreshed all patches. Remove upstreamed patches: - 142-jffs2-Fix-use-of-uninitialized-delayed_work-lockdep-.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mpc85xx')
-rw-r--r--target/linux/mpc85xx/patches-4.14/106-powerpc-85xx-panda-support.patch12
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/mpc85xx/patches-4.14/106-powerpc-85xx-panda-support.patch b/target/linux/mpc85xx/patches-4.14/106-powerpc-85xx-panda-support.patch
index 5844b80f42..a08bc302f2 100644
--- a/target/linux/mpc85xx/patches-4.14/106-powerpc-85xx-panda-support.patch
+++ b/target/linux/mpc85xx/patches-4.14/106-powerpc-85xx-panda-support.patch
@@ -1,7 +1,5 @@
-Index: linux-4.14.82/arch/powerpc/platforms/85xx/Kconfig
-===================================================================
---- linux-4.14.82.orig/arch/powerpc/platforms/85xx/Kconfig
-+++ linux-4.14.82/arch/powerpc/platforms/85xx/Kconfig
+--- a/arch/powerpc/platforms/85xx/Kconfig
++++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -60,6 +60,17 @@ config HIVEAP_330
This board is a Concurrent Dual-Band wireless access point with a
Freescale P1020 SoC.
@@ -20,10 +18,8 @@ Index: linux-4.14.82/arch/powerpc/platforms/85xx/Kconfig
config MPC8540_ADS
bool "Freescale MPC8540 ADS"
select DEFAULT_UIMAGE
-Index: linux-4.14.82/arch/powerpc/platforms/85xx/Makefile
-===================================================================
---- linux-4.14.82.orig/arch/powerpc/platforms/85xx/Makefile
-+++ linux-4.14.82/arch/powerpc/platforms/85xx/Makefile
+--- a/arch/powerpc/platforms/85xx/Makefile
++++ b/arch/powerpc/platforms/85xx/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_P1010_RDB) += p1010rdb.o
obj-$(CONFIG_P1022_DS) += p1022_ds.o
obj-$(CONFIG_P1022_RDK) += p1022_rdk.o