aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-07-01 00:32:10 +0000
committerJonas Gorski <jogo@openwrt.org>2015-07-01 00:32:10 +0000
commitee00711ff8aea18194dd685f0916cced2addb5ba (patch)
treeed500f5b93ae18493d90514ef512a8b30b40eccc /target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch
parentda318364ff2a71c8c9b3e683733d42c5eb2ba58b (diff)
downloadupstream-ee00711ff8aea18194dd685f0916cced2addb5ba.tar.gz
upstream-ee00711ff8aea18194dd685f0916cced2addb5ba.tar.bz2
upstream-ee00711ff8aea18194dd685f0916cced2addb5ba.zip
CC: kernel: update 3.18 to 3.18.17
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17 Backport of r46150. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46155 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch')
-rw-r--r--target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch b/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch
index bc41b0b1d5..4f3cd44677 100644
--- a/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch
+++ b/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -694,6 +694,26 @@ config ATH79_MACH_OM5P
+@@ -704,6 +704,26 @@ config ATH79_MACH_OM5P
select ATH79_DEV_M25P80
select ATH79_DEV_WMAC