Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / net / wireless / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index d1af938b9aa661f5e90e998aa9abe43c323bf7e0..f844b738d34e529de062d6d22f2941ba5d65e3fa 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,7 +1,22 @@
+config IWLCORE
+       tristate "Intel Wireless Wifi Core"
+       depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+
+config IWLWIFI_LEDS
+       bool
+       default n
+
+config IWLWIFI_RFKILL
+       boolean "IWLWIFI RF kill support"
+       depends on IWLCORE
+       select RFKILL
+       select RFKILL_INPUT
+
 config IWL4965
        tristate "Intel Wireless WiFi 4965AGN"
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select FW_LOADER
+       select IWLCORE
        ---help---
          Select to build the driver supporting the:
 
@@ -20,26 +35,26 @@ config IWL4965
          runs.
 
          If you want to compile the driver as a module ( = code which can be
-         inserted in and remvoed from the running kernel whenever you want),
+         inserted in and removed from the running kernel whenever you want),
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwl4965.ko.
 
-config IWL4965_QOS
-       bool "Enable Wireless QoS in iwl4965 driver"
-       depends on IWL4965
-       ---help---
-         This option will enable wireless quality of service (QoS) for the
-         iwl4965 driver.
-
 config IWL4965_HT
        bool "Enable 802.11n HT features in iwl4965 driver"
        depends on EXPERIMENTAL
-       depends on IWL4965 && IWL4965_QOS
-       depends on n
+       depends on IWL4965
        ---help---
          This option enables IEEE 802.11n High Throughput features
          for the iwl4965 driver.
 
+config IWL4965_LEDS
+       bool "Enable LEDS features in iwl4965 driver"
+       depends on IWL4965 && MAC80211_LEDS && LEDS_CLASS
+       select IWLWIFI_LEDS
+       ---help---
+         This option enables LEDS for the iwlwifi drivers
+
+
 config IWL4965_SPECTRUM_MEASUREMENT
        bool "Enable Spectrum Measurement in iwl4965 driver"
        depends on IWL4965
@@ -53,7 +68,7 @@ config IWL4965_SENSITIVITY
          This option will enable sensitivity calibration for the iwl4965
          driver.
 
-config IWL4965_DEBUG
+config IWLWIFI_DEBUG
        bool "Enable full debugging output in iwl4965 driver"
        depends on IWL4965
        ---help---
@@ -79,6 +94,12 @@ config IWL4965_DEBUG
          as the debug information can assist others in helping you resolve
          any problems you may encounter.
 
+config IWLWIFI_DEBUGFS
+        bool "Iwlwifi debugfs support"
+        depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS
+        ---help---
+         Enable creation of debugfs files for the iwlwifi drivers.
+
 config IWL3945
        tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
@@ -101,23 +122,22 @@ config IWL3945
          runs.
 
          If you want to compile the driver as a module ( = code which can be
-         inserted in and remvoed from the running kernel whenever you want),
+         inserted in and removed from the running kernel whenever you want),
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwl3945.ko.
 
-config IWL3945_QOS
-       bool "Enable Wireless QoS in iwl3945 driver"
-       depends on IWL3945
-       ---help---
-         This option will enable wireless quality of service (QoS) for the
-         iwl3945 driver.
-
 config IWL3945_SPECTRUM_MEASUREMENT
        bool "Enable Spectrum Measurement in iwl3945 drivers"
        depends on IWL3945
        ---help---
          This option will enable spectrum measurement for the iwl3945 driver.
 
+config IWL3945_LEDS
+       bool "Enable LEDS features in iwl3945 driver"
+       depends on IWL3945 && MAC80211_LEDS && LEDS_CLASS
+       ---help---
+         This option enables LEDS for the iwl3945 driver.
+
 config IWL3945_DEBUG
        bool "Enable full debugging output in iwl3945 driver"
        depends on IWL3945