Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-block.git] / drivers / net / wireless / iwlwifi / Kconfig

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index b16b06c2031f991e2e93386fcf634fb5070e5736..dc8ed15276667f1abb3ce7b311789a592d2c7ee3 100644 (file)
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,14 +1,8 @@
 config IWLWIFI
        tristate "Intel Wireless Wifi"
-       depends on PCI && MAC80211 && EXPERIMENTAL
+       depends on PCI && MAC80211
        select FW_LOADER
 
-config IWLWIFI_SPECTRUM_MEASUREMENT
-       bool "Enable Spectrum Measurement in iwlagn driver"
-       depends on IWLWIFI
-       ---help---
-         This option will enable spectrum measurement for the iwlagn driver.
-
 config IWLWIFI_DEBUG
        bool "Enable full debugging output in iwlagn and iwl3945 drivers"
        depends on IWLWIFI
@@ -120,9 +114,3 @@ config IWL3945
          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.
-
-config IWL3945_SPECTRUM_MEASUREMENT
-       bool "Enable Spectrum Measurement in iwl3945 driver"
-       depends on IWL3945
-       ---help---
-         This option will enable spectrum measurement for the iwl3945 driver.