--- a/config.mk
+++ b/config.mk
@@ -153,77 +153,77 @@ CONFIG_CFG80211_DEFAULT_PS=y
 CONFIG_CFG80211_DEFAULT_PS_VALUE=1
 # 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_WIRELESS_OLD_REGULATORY=n
 
 # mac80211 test driver
-CONFIG_MAC80211_HWSIM=m
+# CONFIG_MAC80211_HWSIM=m
 
 # PCI Drivers
 ifneq ($(CONFIG_PCI),)
 
-CONFIG_ATH5K=m
+# CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG=y
-CONFIG_ATH5K_RFKILL=y
-CONFIG_ATH9K=m
+# CONFIG_ATH5K_RFKILL=y
+# CONFIG_ATH9K=m
 # CONFIG_ATH9K_DEBUG=y
 
 
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI_RFKILL=y
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
+# CONFIG_IWLWIFI=m
+# CONFIG_IWLWIFI_LEDS=y
+# CONFIG_IWLWIFI_RFKILL=y
+# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
 # CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEBUGFS=y
-CONFIG_IWLAGN=m
-CONFIG_COMPAT_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
+# CONFIG_IWLAGN=m
+# CONFIG_COMPAT_IWL4965=y
+# CONFIG_IWL5000=y
+# CONFIG_IWL3945=m
+# CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 
 
-CONFIG_B43=m
-CONFIG_B43_HWRNG=y
-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=m
+# CONFIG_B43_HWRNG=y
+# 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_HWRNG=y
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_RFKILL=y
+# CONFIG_B43LEGACY=m
+# CONFIG_B43LEGACY_HWRNG=y
+# 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:
@@ -238,46 +238,46 @@ 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_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
-CONFIG_RT2500PCI=m
-CONFIG_RT2800PCI=m
+# CONFIG_RT2X00_LIB_PCI=m
+# CONFIG_RT2400PCI=m
+# CONFIG_RT2500PCI=m
+# CONFIG_RT2800PCI=m
 NEED_RT2X00=y
 
 # Two rt2x00 drivers require firmware: rt61pci and rt73usb. They depend on
 # CRC to check the firmware. We check here first for the PCI
 # driver as we're in the PCI section.
 ifneq ($(CONFIG_CRC_ITU_T),)
-CONFIG_RT61PCI=m
+# 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
@@ -285,22 +285,22 @@ endif
 ifneq ($(CONFIG_PCMCIA),)
 
 ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
-CONFIG_LIBERTAS=n
-CONFIG_LIBERTAS_CS=n
+# CONFIG_LIBERTAS=n
+# CONFIG_LIBERTAS_CS=n
 else
-CONFIG_LIBERTAS_CS=m
-NEED_LIBERTAS=y
+# CONFIG_LIBERTAS_CS=m
+# NEED_LIBERTAS=y
 endif
 
 endif
 ## end of PCMCIA
 
 # This is required for some cards
-CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93CX6=m
 
 # USB Drivers
 ifneq ($(CONFIG_USB),)
-CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG=y
 
 # Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat...
@@ -310,55 +310,55 @@ 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_P54_USB=m
+# CONFIG_RTL8187=m
 
-CONFIG_AT76C50X_USB=m
+# CONFIG_AT76C50X_USB=m
 
 ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 28 && echo yes),yes)
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
+# CONFIG_AR9170_USB=m
+# CONFIG_AR9170_LEDS=y
 endif
 
 # RT2500USB does not require firmware
-CONFIG_RT2500USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2X00_LIB_USB=m
+# CONFIG_RT2500USB=m
+# CONFIG_RT2800USB=m
+# CONFIG_RT2X00_LIB_USB=m
 NEED_RT2X00=y
 # RT73USB requires firmware
 ifneq ($(CONFIG_CRC_ITU_T),)
-CONFIG_RT73USB=m
+# CONFIG_RT73USB=m
 NEED_RT2X00_FIRMWARE=y
 endif
 
 ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
-CONFIG_LIBERTAS_THINFIRM_USB=n
-CONFIG_LIBERTAS_USB=n
-NEED_LIBERTAS=n
+# CONFIG_LIBERTAS_THINFIRM_USB=n
+# CONFIG_LIBERTAS_USB=n
+# NEED_LIBERTAS=n
 else
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_LIBERTAS_USB=m
-NEED_LIBERTAS=y
+# CONFIG_LIBERTAS_THINFIRM_USB=m
+# CONFIG_LIBERTAS_USB=m
+# NEED_LIBERTAS=y
 endif
 
 endif # end of USB driver list
 
 ifneq ($(CONFIG_SPI_MASTER),)
 
-CONFIG_WL1251=m
-CONFIG_P54_SPI=m
+# CONFIG_WL1251=m
+# CONFIG_P54_SPI=m
 
 ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
-CONFIG_LIBERTAS_SPI=n
-NEED_LIBERTAS=n
+# CONFIG_LIBERTAS_SPI=n
+# NEED_LIBERTAS=n
 else
-CONFIG_LIBERTAS_SPI=m
-NEED_LIBERTAS=y
+# CONFIG_LIBERTAS_SPI=m
+# NEED_LIBERTAS=y
 endif
 
 endif # end of SPI driver list
@@ -366,17 +366,17 @@ endif # end of SPI driver list
 ifneq ($(CONFIG_MMC),)
 
 ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
-CONFIG_LIBERTAS_SDIO=n
-NEED_LIBERTAS=n
+# CONFIG_LIBERTAS_SDIO=n
+# NEED_LIBERTAS=n
 else
-CONFIG_LIBERTAS_SDIO=m
-NEED_LIBERTAS=y
+# CONFIG_LIBERTAS_SDIO=m
+# NEED_LIBERTAS=y
 endif
 
 # Activate iwmc3200wifi support only on kernel >= 2.6.29.
 # iwmc3200wifi uses new netdev_ops api no supported by old kernel.
 ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 29 && echo yes),yes)
-CONFIG_IWM=m
+# CONFIG_IWM=m
 # CONFIG_IWM_DEBUG=y
 endif
 
@@ -384,12 +384,12 @@ endif # end of SDIO driver list
 
 # Common rt2x00 requirements
 ifeq ($(NEED_RT2X00),y)
-CONFIG_RT2X00=m
+# CONFIG_RT2X00=m
 CONFIG_RT2X00_LIB=m
 CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_RFKILL=y
+# CONFIG_RT2X00_LIB_RFKILL=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_LIB_DEBUGFS=y
 # CONFIG_RT2X00_DEBUG=y
@@ -400,30 +400,30 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 endif
 
 # p54
-CONFIG_P54_COMMON=m
+# CONFIG_P54_COMMON=m
 CONFIG_P54_LEDS=y
 
 # Atheros
-CONFIG_ATH_COMMON=m
+# CONFIG_ATH_COMMON=m
 
-CONFIG_WL12XX=y
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL1271=m
+# CONFIG_WL12XX=y
+# CONFIG_WL1251=m
+# CONFIG_WL1251_SPI=m
+# CONFIG_WL1251_SDIO=m
+# CONFIG_WL1271=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
 
 ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
-CONFIG_LIBERTAS=n
+# CONFIG_LIBERTAS=n
 else
 ifeq ($(NEED_LIBERTAS),y)
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS=m
+# CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS=m
 # CONFIG_LIBERTAS_DEBUG=y
 endif
 endif
@@ -431,8 +431,8 @@ endif
 # We need the backported rfkill module on kernel < 2.6.31.
 # In more recent kernel versions use the in kernel rfkill module.
 ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 30 && echo yes),yes)
-CONFIG_RFKILL_BACKPORT=m
-CONFIG_RFKILL_BACKPORT_LEDS=y
-CONFIG_RFKILL_BACKPORT_INPUT=y
+# CONFIG_RFKILL_BACKPORT=m
+# CONFIG_RFKILL_BACKPORT_LEDS=y
+# CONFIG_RFKILL_BACKPORT_INPUT=y
 endif