aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-02-07 20:53:16 +0000
committerLuka Perkov <luka@openwrt.org>2015-02-07 20:53:16 +0000
commitfcfbbfc3859723dbc27dcf211d0e12eef30f38f8 (patch)
tree6cd1577daa7bdad989f0eb693e393d3af74c084a /target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch
parent71f96048e6e19ba5b7b7972013b3136fd9a99090 (diff)
downloadupstream-fcfbbfc3859723dbc27dcf211d0e12eef30f38f8.tar.gz
upstream-fcfbbfc3859723dbc27dcf211d0e12eef30f38f8.tar.bz2
upstream-fcfbbfc3859723dbc27dcf211d0e12eef30f38f8.zip
ar71xx: merge board specific patches into one
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 44309
Diffstat (limited to 'target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch')
-rw-r--r--target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch b/target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch
index fdfd7f8c2c..7fcfb02e1a 100644
--- a/target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch
+++ b/target/linux/ar71xx/patches-3.14/707-MIPS-ath79-add-support-for-QCA953x-SoC.patch
@@ -22,7 +22,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed.
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -948,6 +948,10 @@ config SOC_AR934X
+@@ -1165,6 +1165,10 @@ config SOC_AR934X
select PCI_AR724X if PCI
def_bool n
@@ -33,7 +33,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed.
config SOC_QCA955X
select USB_ARCH_HAS_EHCI
select HW_HAS_PCI
-@@ -991,7 +995,7 @@ config ATH79_DEV_USB
+@@ -1208,7 +1212,7 @@ config ATH79_DEV_USB
def_bool n
config ATH79_DEV_WMAC