ar71xx: merge 3.2 fixes

[openwrt.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 3ef315b..ce833cf 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
+@@ -289,7 +289,7 @@ CONFIG_B43=m
+ CONFIG_B43_HWRNG=y
+ CONFIG_B43_PCI_AUTOSELECT=y
+ ifdef CONFIG_PCMCIA
+-CONFIG_B43_PCMCIA=y
++# CONFIG_B43_PCMCIA=y
+ endif #CONFIG_PCMCIA
+ ifdef CONFIG_MAC80211_LEDS
+ CONFIG_B43_LEDS=y