mac80211: sync with trunk (as of r25965)

[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 a9437ce8ea726261cff7008c083ef499c056c92b..7a2181f60962b2138e2b3c995b21572a5871427d 100644 (file)
--- a/package/mac80211/patches/010-no_pcmcia.patch
+++ b/package/mac80211/patches/010-no_pcmcia.patch
@@ -6,24 +6,15 @@
   CONFIG_USB=y
 - CONFIG_PCMCIA=y
 +# CONFIG_PCMCIA=y
-  CONFIG_SSB=m
  else
  include $(KLIB_BUILD)/.config
-@@ -194,7 +194,7 @@ CONFIG_B43=m
+ endif
+@@ -234,7 +234,7 @@ CONFIG_B43=m
  CONFIG_B43_HWRNG=y
  CONFIG_B43_PCI_AUTOSELECT=y
- ifneq ($(CONFIG_PCMCIA),)
+ ifdef CONFIG_PCMCIA
 -CONFIG_B43_PCMCIA=y
 +# CONFIG_B43_PCMCIA=y
- endif
+ endif #CONFIG_PCMCIA
+ ifdef CONFIG_MAC80211_LEDS
  CONFIG_B43_LEDS=y
- CONFIG_B43_PHY_LP=y
-@@ -246,7 +246,7 @@ CONFIG_SSB_BLOCKIO=y
- CONFIG_SSB_PCIHOST=y
- CONFIG_SSB_B43_PCI_BRIDGE=y
- ifneq ($(CONFIG_PCMCIA),)
--CONFIG_SSB_PCMCIAHOST=y
-+# CONFIG_SSB_PCMCIAHOST=y
- endif
- # CONFIG_SSB_DEBUG=y
- CONFIG_SSB_DRIVER_PCICORE=y