--- a/config.mk
+++ b/config.mk
-@@ -104,10 +104,10 @@ CONFIG_MAC80211_MESH=y
+@@ -107,10 +107,10 @@ CONFIG_MAC80211_MESH=y
CONFIG_CFG80211=m
# CONFIG_CFG80211_REG_DEBUG=y
+# CONFIG_LIB80211_CRYPT_TKIP=m
# CONFIG_LIB80211_DEBUG=y
- CONFIG_NL80211=y
-@@ -128,54 +128,54 @@ CONFIG_ATH9K=m
+ CONFIG_WIRELESS_OLD_REGULATORY=n
+@@ -123,61 +123,61 @@ ifneq ($(CONFIG_PCI),)
+
+ CONFIG_ATH5K=m
+ # CONFIG_ATH5K_DEBUG=y
+-CONFIG_ATH5K_RFKILL=y
++# 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_RFKILL=y
+# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
# CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEBUGFS=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_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_RFKILL=y
# CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
# CONFIG_IPW2200_DEBUG=y
# The above enables use a second interface prefixed 'rtap'.
# Example usage:
-@@ -190,27 +190,27 @@ CONFIG_IPW2200_QOS=y
+@@ -192,27 +192,27 @@ CONFIG_IPW2200_QOS=y
#
# % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
+# CONFIG_B44_PCICORE_AUTOSELECT=y
+# CONFIG_B44_PCI=y
--CONFIG_RTL8180=m
-+# CONFIG_RTL8180=m
+ CONFIG_RTL8180=m
-CONFIG_ADM8211=m
-CONFIG_PCMCIA_ATMEL=m
CONFIG_RT2X00_LIB_PCI=m
CONFIG_RT2400PCI=m
-@@ -226,16 +226,16 @@ CONFIG_RT61PCI=m
+@@ -228,24 +228,24 @@ CONFIG_RT61PCI=m
NEED_RT2X00_FIRMWARE=y
endif
endif
## end of PCI
+ ifneq ($(CONFIG_PCMCIA),)
+
+-CONFIG_LIBERTAS_CS=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_CS=m
++# NEED_LIBERTAS=y
+
+ endif
+ ## end of PCMCIA
+
# This is required for some cards
-CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93CX6=m
# USB Drivers
ifneq ($(CONFIG_USB),)
-@@ -249,22 +249,22 @@ CONFIG_ZD1211RW=m
+@@ -259,21 +259,21 @@ 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_P54_USB=m
--CONFIG_RTL8187=m
-+# CONFIG_RTL8187=m
+ CONFIG_RTL8187=m
-CONFIG_AT76C50X_USB=m
+# CONFIG_AT76C50X_USB=m
- # Activate AR9170 support only on kernel >= 2.6.28.
+ # Activate AR9170 support only on kernel >= 2.6.29.
# The needed USB poison feature was added in this kernel release.
- ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 28 && echo yes),yes)
--CONFIG_AR9170_COMMON=m
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 29 && echo yes),yes)
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-+# CONFIG_AR9170_COMMON=m
+# CONFIG_AR9170_USB=m
+# CONFIG_AR9170_LEDS=y
endif
# RT2500USB does not require firmware
-@@ -302,20 +302,20 @@ CONFIG_P54_COMMON=m
+@@ -287,30 +287,30 @@ CONFIG_RT73USB=m
+ NEED_RT2X00_FIRMWARE=y
+ endif
+
+-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 # end of USB driver list
+
+ ifneq ($(CONFIG_SPI_MASTER),)
+
+-CONFIG_WL1251=m
+-CONFIG_P54_SPI=m
+-CONFIG_LIBERTAS_SPI=m
+-NEED_LIBERTAS=y
++# CONFIG_WL1251=m
++# CONFIG_P54_SPI=m
++# CONFIG_LIBERTAS_SPI=m
++# NEED_LIBERTAS=y
+ endif # end of SPI driver list
+
+ ifneq ($(CONFIG_MMC),)
+
+-CONFIG_LIBERTAS_SDIO=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_SDIO=m
++# NEED_LIBERTAS=y
+
+ # 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
+
+@@ -323,7 +323,7 @@ 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
+@@ -340,25 +340,25 @@ CONFIG_P54_LEDS=y
+ # Atheros
+ CONFIG_ATH_COMMON=m
+
+-CONFIG_WL12XX=y
++# CONFIG_WL12XX=y
# Sonics Silicon Backplane
-CONFIG_SSB_POSSIBLE=y
+# 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
+ ifeq ($(NEED_LIBERTAS),y)
+-CONFIG_LIBERTAS_THINFIRM=m
+-CONFIG_LIBERTAS=m
++# CONFIG_LIBERTAS_THINFIRM=m
++# CONFIG_LIBERTAS=m
+ # CONFIG_LIBERTAS_DEBUG=y
endif
- ifneq ($(CONFIG_PCMCIA),)
--CONFIG_LIBERTAS_CS=m
--NEED_LIBERTAS=y
-+# CONFIG_LIBERTAS_CS=m
-+# NEED_LIBERTAS=y
+
+ # 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
- ifeq ($(NEED_LIBERTAS),y)
- CONFIG_LIBERTAS=m
+
projects / openwrt.git / blobdiff