From 5ba480d599b263bce7dcb94ad3c1f77e65fcd393 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 17 Aug 2015 19:01:16 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46680 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch') 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 -- cgit v1.2.3