aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-08-17 19:01:16 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-08-17 19:01:16 +0000
commit5ba480d599b263bce7dcb94ad3c1f77e65fcd393 (patch)
tree929a96e23a2cb0ed51305f83ce9454b273656b19 /target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch
parentaf42a09bc45c7909cb0cd6a8d42e42a6fa5d1aa3 (diff)
downloadupstream-5ba480d599b263bce7dcb94ad3c1f77e65fcd393.tar.gz
upstream-5ba480d599b263bce7dcb94ad3c1f77e65fcd393.tar.bz2
upstream-5ba480d599b263bce7dcb94ad3c1f77e65fcd393.zip
CC: kernel: update 3.18 to 3.18.20
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.20 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46680 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.patch4
1 files changed, 2 insertions, 2 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 22e9b949f8..4e65e0e6d7 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,7 +1,7 @@
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -738,6 +738,26 @@ config ATH79_MACH_OM5P
- select ATH79_DEV_M25P80
+@@ -749,6 +749,26 @@ config ATH79_MACH_ONION_OMEGA
+ select ATH79_DEV_USB
select ATH79_DEV_WMAC
+config ATH79_MACH_MR12