aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2016-03-03 22:28:12 +0000
committerHauke Mehrtens <hauke@openwrt.org>2016-03-03 22:28:12 +0000
commit5ce6da3d7a65968c6c82b75c31009b0f7bcf528e (patch)
tree97c5c16b260853f6c026fe0abfcc8e17440ebad5 /target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
parent124c1ca86a3c7745555636d67e3d99ad75b07aed (diff)
downloadupstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.tar.gz
upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.tar.bz2
upstream-5ce6da3d7a65968c6c82b75c31009b0f7bcf528e.zip
CC: kernel: update kernel 3.18 to version 3.18.27
Changelog: * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.24 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.25 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.26 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.27 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48896 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch')
-rw-r--r--target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
index eecccdcd0d..6d836adb52 100644
--- a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
+++ b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
@@ -378,7 +378,7 @@
}
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -1268,6 +1268,12 @@ config SOC_QCA955X
+@@ -1277,6 +1277,12 @@ config SOC_QCA955X
select PCI_AR724X if PCI
def_bool n
@@ -391,7 +391,7 @@
config ATH79_DEV_M25P80
select ATH79_DEV_SPI
def_bool n
-@@ -1305,7 +1311,7 @@ config ATH79_DEV_USB
+@@ -1314,7 +1320,7 @@ config ATH79_DEV_USB
def_bool n
config ATH79_DEV_WMAC