diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-12-02 21:52:41 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-12-02 21:52:41 +0000 |
commit | f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0 (patch) | |
tree | f4e3850683bbb922227f58993e41a4784a670932 /target/linux/ar71xx | |
parent | 40a09b93d274737c704165f687149b4956fbd45c (diff) | |
download | upstream-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.gz upstream-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.bz2 upstream-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.zip |
kernel: update 4.1 to 4.1.13
- two upstreamed patches removed
- compile tested all targets using 4.1
- run tested ar71xx
Signed-off-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47694
Diffstat (limited to 'target/linux/ar71xx')
3 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/ar71xx/patches-4.1/911-MIPS-ath79-add-gl_ar150.patch b/target/linux/ar71xx/patches-4.1/911-MIPS-ath79-add-gl_ar150.patch index 8c7b4d731b..6f42065865 100644 --- a/target/linux/ar71xx/patches-4.1/911-MIPS-ath79-add-gl_ar150.patch +++ b/target/linux/ar71xx/patches-4.1/911-MIPS-ath79-add-gl_ar150.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -577,6 +577,16 @@ config ATH79_MACH_EL_MINI +@@ -586,6 +586,16 @@ config ATH79_MACH_EL_MINI select ATH79_DEV_USB select ATH79_DEV_WMAC @@ -19,7 +19,7 @@ select SOC_AR933X --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -83,6 +83,7 @@ obj-$(CONFIG_ATH79_MACH_EL_MINI) += mach +@@ -84,6 +84,7 @@ obj-$(CONFIG_ATH79_MACH_EL_MINI) += mach obj-$(CONFIG_ATH79_MACH_EPG5000) += mach-epg5000.o obj-$(CONFIG_ATH79_MACH_ESR1750) += mach-esr1750.o obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o @@ -29,7 +29,7 @@ obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -72,6 +72,7 @@ enum ath79_mach_type { +@@ -73,6 +73,7 @@ enum ath79_mach_type { ATH79_MACH_ESR1750, /* EnGenius ESR1750 */ ATH79_MACH_EPG5000, /* EnGenius EPG5000 */ ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */ diff --git a/target/linux/ar71xx/patches-4.1/912-MIPS-ath79-add-gl_ar300.patch b/target/linux/ar71xx/patches-4.1/912-MIPS-ath79-add-gl_ar300.patch index 6ca9913b2d..e9c0f4f142 100644 --- a/target/linux/ar71xx/patches-4.1/912-MIPS-ath79-add-gl_ar300.patch +++ b/target/linux/ar71xx/patches-4.1/912-MIPS-ath79-add-gl_ar300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -587,6 +587,16 @@ config ATH79_MACH_GL_AR150 +@@ -596,6 +596,16 @@ config ATH79_MACH_GL_AR150 select ATH79_DEV_USB select ATH79_DEV_WMAC @@ -19,7 +19,7 @@ select SOC_AR933X --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -84,6 +84,7 @@ obj-$(CONFIG_ATH79_MACH_EPG5000) += mach +@@ -85,6 +85,7 @@ obj-$(CONFIG_ATH79_MACH_EPG5000) += mach obj-$(CONFIG_ATH79_MACH_ESR1750) += mach-esr1750.o obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o obj-$(CONFIG_ATH79_MACH_GL_AR150) += mach-gl-ar150.o @@ -29,7 +29,7 @@ obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -73,6 +73,7 @@ enum ath79_mach_type { +@@ -74,6 +74,7 @@ enum ath79_mach_type { ATH79_MACH_EPG5000, /* EnGenius EPG5000 */ ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */ ATH79_MACH_GL_AR150, /* GL-AR150 support */ diff --git a/target/linux/ar71xx/patches-4.1/913-MIPS-ath79-add-domino-support.patch b/target/linux/ar71xx/patches-4.1/913-MIPS-ath79-add-domino-support.patch index 80351cf979..6524ba82e4 100644 --- a/target/linux/ar71xx/patches-4.1/913-MIPS-ath79-add-domino-support.patch +++ b/target/linux/ar71xx/patches-4.1/913-MIPS-ath79-add-domino-support.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/Kconfig +++ b/arch/mips/ath79/Kconfig -@@ -597,6 +597,16 @@ config ATH79_MACH_GL_AR300 +@@ -606,6 +606,16 @@ config ATH79_MACH_GL_AR300 select ATH79_DEV_USB select ATH79_DEV_WMAC @@ -19,7 +19,7 @@ select SOC_AR933X --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -85,6 +85,7 @@ obj-$(CONFIG_ATH79_MACH_ESR1750) += mach +@@ -86,6 +86,7 @@ obj-$(CONFIG_ATH79_MACH_ESR1750) += mach obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o obj-$(CONFIG_ATH79_MACH_GL_AR150) += mach-gl-ar150.o obj-$(CONFIG_ATH79_MACH_GL_AR300) += mach-gl-ar300.o @@ -29,7 +29,7 @@ obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -74,6 +74,7 @@ enum ath79_mach_type { +@@ -75,6 +75,7 @@ enum ath79_mach_type { ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */ ATH79_MACH_GL_AR150, /* GL-AR150 support */ ATH79_MACH_GL_AR300, /* GL-AR300 */ |