ath9k: merge chainmask fix from r24657

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 011-no_sdio.patch

diff --git a/package/mac80211/patches/011-no_sdio.patch b/package/mac80211/patches/011-no_sdio.patch
index d263f4e692efc40293f5f660869455fbec1ed884..aba19b644a65607d9ed56a0627ecfeb30e2c2abc 100644 (file)
--- a/package/mac80211/patches/011-no_sdio.patch
+++ b/package/mac80211/patches/011-no_sdio.patch
@@ -1,11 +1,11 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -380,7 +380,7 @@ endif # end of SPI driver list
+@@ -467,7 +467,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
  
- ifneq ($(CONFIG_MMC),)
+ ifdef CONFIG_MMC
  
 -CONFIG_B43_SDIO=y
 +# CONFIG_B43_SDIO=y
- CONFIG_WL1251_SDIO=m
  
- ifneq ($(CONFIG_ARM),)
+ ifdef CONFIG_CRC7
+ ifdef CONFIG_WL12XX_PLATFORM_DATA