Merge branch 'linus' into core/generic-dma-coherent

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

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index cc0006900b30f31ba796f144885dfa0fee2950d1..82b66a3d3a5dc2920f3768d3058f521c40a6b58d 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,6 +1,5 @@
 config IWLWIFI
-       bool
-       default n
+       tristate
 
 config IWLCORE
        tristate "Intel Wireless Wifi Core"
@@ -9,21 +8,11 @@ config IWLCORE
        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_RUN_TIME_CALIB
-       bool
-       depends on IWLCORE
-       default n
-       ---help---
-         This option will enable run time calibration for the iwlwifi driver.
-         These calibrations are Sensitivity and Chain Noise.
-
-
 config IWLWIFI_RFKILL
        boolean "IWLWIFI RF kill support"
        depends on IWLCORE
@@ -55,14 +44,6 @@ 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
@@ -77,15 +58,6 @@ config IWL4965_SPECTRUM_MEASUREMENT
        ---help---
          This option will enable spectrum measurement for the iwl4965 driver.
 
-config IWL4965_RUN_TIME_CALIB
-       bool "Enable run time Calibration for 4965 NIC"
-       select IWLWIFI_RUN_TIME_CALIB
-       depends on IWL4965
-       default y
-       ---help---
-         This option will enable run time calibration for the iwl4965 driver.
-         These calibrations are Sensitivity and Chain Noise. If unsure, say yes
-
 config IWLWIFI_DEBUG
        bool "Enable full debugging output in iwl4965 driver"
        depends on IWL4965
@@ -97,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
@@ -119,16 +91,6 @@ config IWL5000
          This option enables support for Intel Wireless WiFi Link 5000AGN Family
          Dependency on 4965 is temporary
 
-config IWL5000_RUN_TIME_CALIB
-       bool "Enable run time Calibration for 5000 NIC"
-       select IWLWIFI_RUN_TIME_CALIB
-       depends on IWL5000
-       default y
-       ---help---
-         This option will enable run time calibration for the iwl5000 driver.
-         These calibrations are Sensitivity and Chain Noise. If unsure, say yes
-
-
 config IWLWIFI_DEBUGFS
         bool "Iwlwifi debugfs support"
         depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS
@@ -142,6 +104,7 @@ config IWL3945
        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:
 
@@ -164,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