Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

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

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index b54ff712e7035ad2733beffa1a281e3422f1a460..d5b7a76fcaad62b3d684ad9bf697b4f27d9b3c59 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,7 +1,29 @@
+config IWLWIFI
+       bool
+       default n
+
+config IWLCORE
+       tristate "Intel Wireless Wifi Core"
+       depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+       select IWLWIFI
+       select MAC80211_LEDS if IWLWIFI_LEDS
+       select LEDS_CLASS if IWLWIFI_LEDS
+       select RFKILL if IWLWIFI_RFKILL
+       select RFKILL_INPUT if IWLWIFI_RFKILL
+
+config IWLWIFI_LEDS
+       bool
+       default n
+
+config IWLWIFI_RFKILL
+       boolean "IWLWIFI RF kill support"
+       depends on IWLCORE
+
 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:
 
@@ -24,21 +46,22 @@ config IWL4965
          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 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
+       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
@@ -52,7 +75,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---
@@ -78,10 +101,19 @@ 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
        select FW_LOADER
+       select IWLWIFI
+       select MAC80211_LEDS if IWL3945_LEDS
+       select LEDS_CLASS if IWL3945_LEDS
        ---help---
          Select to build the driver supporting the:
 
@@ -104,19 +136,18 @@ config IWL3945
          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
+       ---help---
+         This option enables LEDS for the iwl3945 driver.
+
 config IWL3945_DEBUG
        bool "Enable full debugging output in iwl3945 driver"
        depends on IWL3945