ar71xx: merge board specific patches into one

[openwrt.git] / target / linux / ar71xx / patches-3.14 / 735-MIPS-ath79-add-support-for-QCA956x-SoC.patch

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 b8e7458..c3a79df 100644 (file)
--- 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