merge latest mac80211 from trunk (as of r22038) 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 04a8029c36174bc6c0ecc5d103f32b2bd2181287..3f7fd5a2ca988968b3251dd7883e489430495a56 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
-@@ -396,8 +396,8 @@ endif # end of SPI driver list
+@@ -398,7 +398,7 @@ endif # end of SPI driver list
  
  ifneq ($(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),)
+ ifndef CONFIG_COMPAT_KERNEL_32