Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

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

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index 82b66a3d3a5dc2920f3768d3058f521c40a6b58d..b0ac0ce3fb9f6dfb4c8d126ded42f4621d9e2877 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -14,18 +14,49 @@ config IWLWIFI_LEDS
        default n
 
 config IWLWIFI_RFKILL
-       boolean "IWLWIFI RF kill support"
+       boolean "Iwlwifi RF kill support"
        depends on IWLCORE
 
-config IWL4965
-       tristate "Intel Wireless WiFi 4965AGN"
+config IWLWIFI_DEBUG
+       bool "Enable full debugging output in iwlagn driver"
+       depends on IWLCORE
+       ---help---
+         This option will enable debug tracing output for the iwlwifi drivers
+
+         This will result in the kernel module being ~100k larger.  You can
+         control which debug output is sent to the kernel log by setting the
+         value in
+
+               /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/class/net/wlan0/device/debug_level
+
+         You can find the list of debug mask values in:
+                 drivers/net/wireless/iwlwifi/iwl-debug.h
+
+         If this is your first time using this driver, you should say Y here
+         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 IWLAGN
+       tristate "Intel Wireless WiFi Next Gen AGN"
        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
        select FW_LOADER
        select IWLCORE
        ---help---
          Select to build the driver supporting the:
 
-         Intel Wireless WiFi Link 4965AGN
+         Intel Wireless WiFi Link Next-Gen AGN
 
          This driver uses the kernel's mac80211 subsystem.
 
@@ -42,60 +73,33 @@ config IWL4965
          If you want to compile the driver as a module ( = code which can be
          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_LEDS
-       bool "Enable LEDS features in iwl4965 driver"
-       depends on IWL4965
-       select IWLWIFI_LEDS
-       ---help---
-         This option enables LEDS for the iwlwifi drivers
+         module will be called iwlagn.ko.
 
-
-config IWL4965_SPECTRUM_MEASUREMENT
-       bool "Enable Spectrum Measurement in iwl4965 driver"
-       depends on IWL4965
+config IWLAGN_SPECTRUM_MEASUREMENT
+       bool "Enable Spectrum Measurement in iwlagn driver"
+       depends on IWLAGN
        ---help---
-         This option will enable spectrum measurement for the iwl4965 driver.
+         This option will enable spectrum measurement for the iwlagn driver.
 
-config IWLWIFI_DEBUG
-       bool "Enable full debugging output in iwl4965 driver"
-       depends on IWL4965
+config IWLAGN_LEDS
+       bool "Enable LEDS features in iwlagn driver"
+       depends on IWLAGN
+       select IWLWIFI_LEDS
        ---help---
-         This option will enable debug tracing output for the iwl4965
-         driver.
-
-         This will result in the kernel module being ~100k larger.  You can
-         control which debug output is sent to the kernel log by setting the
-         value in
-
-               /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/class/net/wlan0/device/debug_level
+         This option enables LEDS for the iwlagn drivers
 
-         You can find the list of debug mask values in:
-                 drivers/net/wireless/iwlwifi/iwl-4965-debug.h
 
-         If this is your first time using this driver, you should say Y here
-         as the debug information can assist others in helping you resolve
-         any problems you may encounter.
+config IWL4965
+       bool "Intel Wireless WiFi 4965AGN"
+       depends on IWLAGN
+       ---help---
+         This option enables support for Intel Wireless WiFi Link 4965AGN
 
 config IWL5000
        bool "Intel Wireless WiFi 5000AGN"
-       depends on IWL4965
+       depends on IWLAGN
        ---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
-        ---help---
-         Enable creation of debugfs files for the iwlwifi drivers.
 
 config IWL3945
        tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"