Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

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

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 9a25f550fd16461067b029b3c7a4fcf6e458ebb5..82b66a3d3a5dc2920f3768d3058f521c40a6b58d 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,11 +1,13 @@
 config IWLWIFI
-       bool
-       default n
+       tristate
 
 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
 
 config IWLWIFI_LEDS
        bool
@@ -14,8 +16,6 @@ config IWLWIFI_LEDS
 config IWLWIFI_RFKILL
        boolean "IWLWIFI RF kill support"
        depends on IWLCORE
-       select RFKILL
-       select RFKILL_INPUT
 
 config IWL4965
        tristate "Intel Wireless WiFi 4965AGN"
@@ -44,19 +44,9 @@ config IWL4965
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwl4965.ko.
 
-config IWL4965_HT
-       bool "Enable 802.11n HT features in iwl4965 driver"
-       depends on EXPERIMENTAL
-       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 MAC80211_LEDS
-       select LEDS_CLASS
        select IWLWIFI_LEDS
        ---help---
          This option enables LEDS for the iwlwifi drivers
@@ -68,13 +58,6 @@ config IWL4965_SPECTRUM_MEASUREMENT
        ---help---
          This option will enable spectrum measurement for the iwl4965 driver.
 
-config IWL4965_SENSITIVITY
-       bool "Enable Sensitivity Calibration in iwl4965 driver"
-       depends on IWL4965
-       ---help---
-         This option will enable sensitivity calibration for the iwl4965
-         driver.
-
 config IWLWIFI_DEBUG
        bool "Enable full debugging output in iwl4965 driver"
        depends on IWL4965
@@ -86,13 +69,13 @@ config IWLWIFI_DEBUG
          control which debug output is sent to the kernel log by setting the
          value in
 
-                 /sys/bus/pci/drivers/${DRIVER}/debug_level
+               /sys/class/net/wlan0/device/debug_level
 
          This entry will only exist if this option is enabled.
 
          To set a value, simply echo an 8-byte hex value to the same file:
 
-                 % echo 0x43fff > /sys/bus/pci/drivers/${DRIVER}/debug_level
+                 % echo 0x43fff > /sys/class/net/wlan0/device/debug_level
 
          You can find the list of debug mask values in:
                  drivers/net/wireless/iwlwifi/iwl-4965-debug.h
@@ -101,6 +84,13 @@ config IWLWIFI_DEBUG
          as the debug information can assist others in helping you resolve
          any problems you may encounter.
 
+config IWL5000
+       bool "Intel Wireless WiFi 5000AGN"
+       depends on IWL4965
+       ---help---
+         This option enables support for Intel Wireless WiFi Link 5000AGN Family
+         Dependency on 4965 is temporary
+
 config IWLWIFI_DEBUGFS
         bool "Iwlwifi debugfs support"
         depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS
@@ -112,6 +102,9 @@ config IWL3945
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select FW_LOADER
        select IWLWIFI
+       select MAC80211_LEDS if IWL3945_LEDS
+       select LEDS_CLASS if IWL3945_LEDS
+       select RFKILL if IWL3945_RFKILL
        ---help---
          Select to build the driver supporting the:
 
@@ -134,6 +127,10 @@ config IWL3945
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwl3945.ko.
 
+config IWL3945_RFKILL
+       bool "Enable RF kill support in iwl3945 drivers"
+       depends on IWL3945
+
 config IWL3945_SPECTRUM_MEASUREMENT
        bool "Enable Spectrum Measurement in iwl3945 drivers"
        depends on IWL3945
@@ -143,8 +140,6 @@ config IWL3945_SPECTRUM_MEASUREMENT
 config IWL3945_LEDS
        bool "Enable LEDS features in iwl3945 driver"
        depends on IWL3945
-       select MAC80211_LEDS
-       select LEDS_CLASS
        ---help---
          This option enables LEDS for the iwl3945 driver.