mac80211: merge version 2010-09-14 from trunk

[openwrt-10.03/.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 bd6bdfe78fa4ba26399b83539866ef649c10a09d..42792fb57e2da2ac95a7132167edbadcc5f2fc97 100644 (file)
--- a/package/mac80211/patches/011-no_sdio.patch
+++ b/package/mac80211/patches/011-no_sdio.patch
@@ -1,13 +1,11 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -407,8 +407,8 @@ endif # end of SPI driver list
+@@ -441,7 +441,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv
  
- ifneq ($(CONFIG_MMC),)
+ ifdef CONFIG_MMC
  
--CONFIG_SSB_SDIOHOST=y
 -CONFIG_B43_SDIO=y
-+# CONFIG_SSB_SDIOHOST=y
 +# CONFIG_B43_SDIO=y
- CONFIG_WL1251_SDIO=m
  
- ifneq ($(CONFIG_ARM),)
+ ifdef CONFIG_CRC7
+ CONFIG_WL1251_SDIO=m