aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-07-04 13:34:25 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-07-04 13:34:25 +0200
commit8bdbf41791d19c921d00132cfb25ea946dfcfd21 (patch)
tree93e9140f42002b44e2f8796ac2601d107002c7b4 /target/linux/oxnas
parentfa936d20990f7b8cfd999d4c468116d55ab3f3ef (diff)
downloadmaster-187ad058-8bdbf41791d19c921d00132cfb25ea946dfcfd21.tar.gz
master-187ad058-8bdbf41791d19c921d00132cfb25ea946dfcfd21.tar.bz2
master-187ad058-8bdbf41791d19c921d00132cfb25ea946dfcfd21.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')
-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"