aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-3.18/300-introduce-oxnas-platform.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:48:26 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:48:26 +0000
commit2f99e562e03487b927782fcd0f690346d71c34e1 (patch)
tree0e0299593a79411fc54596a60bcc0b05db458703 /target/linux/oxnas/patches-3.18/300-introduce-oxnas-platform.patch
parent0625aaa6f37dcf6a2ffb611245fa9b6477642b78 (diff)
downloadupstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.gz
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.bz2
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.zip
CC: kernel: update kernel 3.18 to version 3.18.23
Changelog: * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23 backport of r47334. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47335 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas/patches-3.18/300-introduce-oxnas-platform.patch')
-rw-r--r--target/linux/oxnas/patches-3.18/300-introduce-oxnas-platform.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/oxnas/patches-3.18/300-introduce-oxnas-platform.patch b/target/linux/oxnas/patches-3.18/300-introduce-oxnas-platform.patch
index 5724263d3f..6647457859 100644
--- a/target/linux/oxnas/patches-3.18/300-introduce-oxnas-platform.patch
+++ b/target/linux/oxnas/patches-3.18/300-introduce-oxnas-platform.patch
@@ -29,7 +29,7 @@
source "arch/arm/mach-pxa/Kconfig"
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
-@@ -187,6 +187,7 @@ machine-$(CONFIG_ARCH_NSPIRE) += nspire
+@@ -195,6 +195,7 @@ machine-$(CONFIG_ARCH_NSPIRE) += nspire
machine-$(CONFIG_ARCH_OMAP1) += omap1
machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
machine-$(CONFIG_ARCH_ORION5X) += orion5x