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>2015-11-01 13:48:26 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-11-01 13:48:26 +0000
commit2f99e562e03487b927782fcd0f690346d71c34e1 (patch)
tree0e0299593a79411fc54596a60bcc0b05db458703 /target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
parent0625aaa6f37dcf6a2ffb611245fa9b6477642b78 (diff)
downloadupstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.gz
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.tar.bz2
upstream-2f99e562e03487b927782fcd0f690346d71c34e1.zip
CC: kernel: update kernel 3.18 to version 3.18.23
Changelog: * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.22 * https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.23 backport of r47334. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47335 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 8f15790e30..491a7aa4f4 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
-@@ -1248,6 +1248,12 @@ config SOC_QCA955X
+@@ -1268,6 +1268,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
-@@ -1285,7 +1291,7 @@ config ATH79_DEV_USB
+@@ -1305,7 +1311,7 @@ config ATH79_DEV_USB
def_bool n
config ATH79_DEV_WMAC