aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.14/735-MIPS-ath79-add-support-for-QCA956x-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
commit905361b89cded32b4cd084e0f84fac219f145baf (patch)
treefedd4d5b00299850b333c029b67d904ac0f41d84 /target/linux/ar71xx/patches-3.14/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
parentb7c188b9a96cbb0b52f928a0f2e8cb8088ee3dfa (diff)
downloadmaster-187ad058-905361b89cded32b4cd084e0f84fac219f145baf.tar.gz
master-187ad058-905361b89cded32b4cd084e0f84fac219f145baf.tar.bz2
master-187ad058-905361b89cded32b4cd084e0f84fac219f145baf.zip
ar71xx: merge board specific patches into one
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44309 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.14/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch')
-rw-r--r--target/linux/ar71xx/patches-3.14/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-3.14/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch b/target/linux/ar71xx/patches-3.14/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
index b8e7458e34..c3a79df8a8 100644
--- a/target/linux/ar71xx/patches-3.14/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
+++ b/target/linux/ar71xx/patches-3.14/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
@@ -445,7 +445,7 @@
}
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -1165,6 +1165,12 @@ config SOC_QCA955X
+@@ -1175,6 +1175,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
-@@ -1202,7 +1208,7 @@ config ATH79_DEV_USB
+@@ -1212,7 +1218,7 @@ config ATH79_DEV_USB
def_bool n
config ATH79_DEV_WMAC