diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-06-30 23:26:09 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-30 23:26:09 +0000 |
commit | 901a7fa067c63a81eda14becfffa1bbd79009e33 (patch) | |
tree | 6d0baf583d89eec283789e912136ad8de58f42d4 /target/linux/ar71xx/patches-3.18/738-MIPS-ath79-add-meraki-mr12-mr16-support.patch | |
parent | ad80d3869dd67d8e71581f7e0028bb0238901fda (diff) | |
download | upstream-901a7fa067c63a81eda14becfffa1bbd79009e33.tar.gz upstream-901a7fa067c63a81eda14becfffa1bbd79009e33.tar.bz2 upstream-901a7fa067c63a81eda14becfffa1bbd79009e33.zip |
kernel: update 3.18 to 3.18.17
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.17
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46150
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.patch | 6 |
1 files changed, 3 insertions, 3 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..5d29b0be6d 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 +@@ -714,6 +714,26 @@ config ATH79_MACH_OM5P select ATH79_DEV_M25P80 select ATH79_DEV_WMAC @@ -29,7 +29,7 @@ select SOC_AR934X --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -78,6 +78,8 @@ obj-$(CONFIG_ATH79_MACH_JA76PF) += mach +@@ -79,6 +79,8 @@ obj-$(CONFIG_ATH79_MACH_JA76PF) += mach obj-$(CONFIG_ATH79_MACH_JWAP003) += mach-jwap003.o obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o obj-$(CONFIG_ATH79_MACH_MC_MAC1200R) += mach-mc-mac1200r.o @@ -40,7 +40,7 @@ obj-$(CONFIG_ATH79_MACH_MYNET_N600) += mach-mynet-n600.o --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -67,6 +67,8 @@ enum ath79_mach_type { +@@ -68,6 +68,8 @@ enum ath79_mach_type { ATH79_MACH_JA76PF2, /* jjPlus JA76PF2 */ ATH79_MACH_JWAP003, /* jjPlus JWAP003 */ ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */ |