aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-4.4/300-introduce-oxnas-platform.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-06-26 14:45:12 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2016-06-26 18:20:37 +0200
commit84d489f64f3b382d5544e342f66d8806e94e85d3 (patch)
treedca318969c99733fc177e8564ccad33beb4d2c58 /target/linux/oxnas/patches-4.4/300-introduce-oxnas-platform.patch
parent3bf35126733a4b4073c1d3388e226c2a8f79d65b (diff)
downloadupstream-84d489f64f3b382d5544e342f66d8806e94e85d3.tar.gz
upstream-84d489f64f3b382d5544e342f66d8806e94e85d3.tar.bz2
upstream-84d489f64f3b382d5544e342f66d8806e94e85d3.zip
kernel: update to version 4.4.14
Changelog: https://cdn.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.4.14 Some manual changes to target/linux/generic/patches-4.4/610- netfilter_match_bypass_default_checks.patch were needed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/oxnas/patches-4.4/300-introduce-oxnas-platform.patch')
-rw-r--r--target/linux/oxnas/patches-4.4/300-introduce-oxnas-platform.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-4.4/300-introduce-oxnas-platform.patch b/target/linux/oxnas/patches-4.4/300-introduce-oxnas-platform.patch
index b3a8dc0f90..a88d5d94b5 100644
--- a/target/linux/oxnas/patches-4.4/300-introduce-oxnas-platform.patch
+++ b/target/linux/oxnas/patches-4.4/300-introduce-oxnas-platform.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -602,6 +602,19 @@ config ARCH_LPC32XX
+@@ -603,6 +603,19 @@ config ARCH_LPC32XX
help
Support for the NXP LPC32XX family of processors
@@ -20,7 +20,7 @@
config ARCH_PXA
bool "PXA2xx/PXA3xx-based"
depends on MMU
-@@ -882,6 +895,8 @@ source "arch/arm/mach-omap2/Kconfig"
+@@ -883,6 +896,8 @@ source "arch/arm/mach-omap2/Kconfig"
source "arch/arm/mach-orion5x/Kconfig"