merge latest mac80211 from trunk (as of r22038) to backfire

[openwrt-10.03/.git] / package / mac80211 / patches / 010-no_pcmcia.patch

diff --git a/package/mac80211/patches/010-no_pcmcia.patch b/package/mac80211/patches/010-no_pcmcia.patch
index 3ef315b3ad672a9dbe6f2c053e1e22ba45aaf0ec..0c8072a3ef5f0fe173a5b57e26cdc4895a5af461 100644 (file)
--- a/package/mac80211/patches/010-no_pcmcia.patch
+++ b/package/mac80211/patches/010-no_pcmcia.patch
@@ -5,7 +5,16 @@
   CONFIG_PCI=y
   CONFIG_USB=y
 - CONFIG_PCMCIA=y
-+ # CONFIG_PCMCIA=y
-  CONFIG_SSB=m
++# CONFIG_PCMCIA=y
  else
  include $(KLIB_BUILD)/.config
+ endif
+@@ -192,7 +192,7 @@ CONFIG_B43=m
+ CONFIG_B43_HWRNG=y
+ CONFIG_B43_PCI_AUTOSELECT=y
+ ifneq ($(CONFIG_PCMCIA),)
+-CONFIG_B43_PCMCIA=y
++# CONFIG_B43_PCMCIA=y
+ endif
+ CONFIG_B43_LEDS=y
+ CONFIG_B43_PHY_LP=y