Index: compat-wireless-2009-03-18/config.mk
===================================================================
--- compat-wireless-2009-03-18.orig/config.mk	2009-03-20 17:10:09.000000000 +0100
+++ compat-wireless-2009-03-18/config.mk	2009-03-20 17:11:31.000000000 +0100
@@ -104,10 +104,10 @@ CONFIG_MAC80211_MESH=y
 CONFIG_CFG80211=m
 # CONFIG_CFG80211_REG_DEBUG=y
 
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211=m
+# CONFIG_LIB80211_CRYPT_WEP=m
+# CONFIG_LIB80211_CRYPT_CCMP=m
+# CONFIG_LIB80211_CRYPT_TKIP=m
 # CONFIG_LIB80211_DEBUG=y
 
 CONFIG_NL80211=y
@@ -128,54 +128,54 @@ CONFIG_ATH9K=m
 # CONFIG_ATH9K_DEBUG=y
 
 
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
+# CONFIG_IWLWIFI=m
+# CONFIG_IWLWIFI_LEDS=y
 # CONFIG_IWLWIFI_RFKILL=y
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
+# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
 # CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEBUGFS=y
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
+# CONFIG_IWLAGN=m
+# CONFIG_IWL4965=y
+# CONFIG_IWL5000=y
+# CONFIG_IWL3945=m
+# CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 
 
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_PIO=y
-CONFIG_B43_LEDS=y
+# CONFIG_B43=m
+# CONFIG_B43_PCI_AUTOSELECT=y
+# CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_PCMCIA=y
+# CONFIG_B43_PIO=y
+# CONFIG_B43_LEDS=y
 # CONFIG_B43_RFKILL=y
 # CONFIG_B43_DEBUG=y
 # CONFIG_B43_FORCE_PIO=y
 
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
+# CONFIG_B43LEGACY=m
+# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+# CONFIG_B43LEGACY_LEDS=y
 # CONFIG_B43LEGACY_RFKILL=y
 # CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE=y
+# CONFIG_B43LEGACY_PIO=y
+# CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+CONFIG_B43LEGACY_DMA_MODE=y
 # CONFIG_B43LEGACY_PIO_MODE=y
 
 # The Intel ipws
-CONFIG_LIBIPW=m
+# CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG=y
 
 
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100=m
+# CONFIG_IPW2100_MONITOR=y
 # CONFIG_IPW2100_DEBUG=y
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200=m
+# CONFIG_IPW2200_MONITOR=y
+# CONFIG_IPW2200_RADIOTAP=y
+# CONFIG_IPW2200_PROMISCUOUS=y
+# CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG=y
 # The above enables use a second interface prefixed 'rtap'.
 #           Example usage:
@@ -190,27 +190,27 @@ CONFIG_IPW2200_QOS=y
 #
 # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
 
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
+# CONFIG_SSB_BLOCKIO=y
+# CONFIG_SSB_PCIHOST_POSSIBLE=y
+# CONFIG_SSB_PCIHOST=y
+# CONFIG_SSB_B43_PCI_BRIDGE=y
+# CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+# CONFIG_SSB_PCMCIAHOST=y
 # CONFIG_SSB_DEBUG=y
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
+# CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+# CONFIG_SSB_DRIVER_PCICORE=y
 
 CONFIG_P54_PCI=m
 
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
+# CONFIG_B44=m
+# CONFIG_B44_PCI_AUTOSELECT=y
+# CONFIG_B44_PCICORE_AUTOSELECT=y
+# CONFIG_B44_PCI=y
 
-CONFIG_RTL8180=m
+# CONFIG_RTL8180=m
 
-CONFIG_ADM8211=m
-CONFIG_PCMCIA_ATMEL=m
+# CONFIG_ADM8211=m
+# CONFIG_PCMCIA_ATMEL=m
 
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2400PCI=m
@@ -226,16 +226,16 @@ CONFIG_RT61PCI=m
 NEED_RT2X00_FIRMWARE=y
 endif
 
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
+# CONFIG_ATMEL=m
+# CONFIG_PCI_ATMEL=m
 
-CONFIG_MWL8K=m
+# CONFIG_MWL8K=m
 
 endif
 ## end of PCI
 
 # This is required for some cards
-CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93CX6=m
 
 # USB Drivers
 ifneq ($(CONFIG_USB),)
@@ -249,15 +249,15 @@ CONFIG_ZD1211RW=m
 # is only wireless RNDIS chip known to date.
 # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
 # it also requires new RNDIS_HOST and CDC_ETHER modules which we add
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_RNDIS_HOST=m
+# CONFIG_USB_NET_RNDIS_WLAN=m
+# CONFIG_USB_NET_CDCETHER=m
 
 
 CONFIG_P54_USB=m
-CONFIG_RTL8187=m
+# CONFIG_RTL8187=m
 
-CONFIG_AT76C50X_USB=m
+# CONFIG_AT76C50X_USB=m
 
 # RT2500USB does not require firmware
 CONFIG_RT2500USB=m
@@ -294,20 +294,20 @@ CONFIG_P54_COMMON=m
 
 
 # Sonics Silicon Backplane
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
+# CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB=m
+# CONFIG_SSB_SPROM=y
 # CONFIG_SSB_DEBUG=y
 
 ifneq ($(CONFIG_USB),)
 ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)
-CONFIG_LIBERTAS_USB=m
-NEED_LIBERTAS=y
+# CONFIG_LIBERTAS_USB=m
+# NEED_LIBERTAS=y
 endif
 endif
 ifneq ($(CONFIG_PCMCIA),)
-CONFIG_LIBERTAS_CS=m
-NEED_LIBERTAS=y
+# CONFIG_LIBERTAS_CS=m
+# NEED_LIBERTAS=y
 endif
 ifeq ($(NEED_LIBERTAS),y)
 CONFIG_LIBERTAS=m