aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-07-25 10:02:47 +0000
committerJonas Gorski <jogo@openwrt.org>2015-07-25 10:02:47 +0000
commitc84640edc825e2fc2dd6c3a424506ad7cc7decf3 (patch)
tree5ba5097475bbc7830f2d561c66549203b25c57b7 /target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
parentc8ebf766becbfbf41c228379cb304658748c906d (diff)
downloadupstream-c84640edc825e2fc2dd6c3a424506ad7cc7decf3.tar.gz
upstream-c84640edc825e2fc2dd6c3a424506ad7cc7decf3.tar.bz2
upstream-c84640edc825e2fc2dd6c3a424506ad7cc7decf3.zip
CC: kernel: update 3.18 to 3.18.19
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.19 Backport of r46439. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46487 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 f95fc0b597..90c9b3355c 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
@@ -445,7 +445,7 @@
}
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -1203,6 +1203,12 @@ config SOC_QCA955X
+@@ -1237,6 +1237,12 @@ config SOC_QCA955X
select PCI_AR724X if PCI
def_bool n
@@ -458,7 +458,7 @@
config ATH79_DEV_M25P80
select ATH79_DEV_SPI
def_bool n
-@@ -1240,7 +1246,7 @@ config ATH79_DEV_USB
+@@ -1274,7 +1280,7 @@ config ATH79_DEV_USB
def_bool n
config ATH79_DEV_WMAC