merge mac80211, iw, hostapd from trunk to backfire

[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 3f7fd5a2ca988968b3251dd7883e489430495a56..2e906f56bac018049b6d40f8cc563353f44511f3 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
-@@ -398,7 +398,7 @@ endif # end of SPI driver list
+@@ -452,7 +452,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
  
- ifndef CONFIG_COMPAT_KERNEL_32
+ ifdef CONFIG_CRC7
+ CONFIG_WL1251_SDIO=m