diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-29 13:41:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-29 13:41:25 -0800 |
| commit | 4a80f2788952055a627f2093a0174537d70aec1b (patch) | |
| tree | 411c8ec555fe85cf9faa9da90e62ab781b33661c /drivers/net/wireless/iwlwifi/Kconfig | |
| parent | 03a64c93b68e1eff299b9bbbb0d13105171cddc4 (diff) | |
| parent | e4861829072c61883114c64a3af61f305a789ff0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26
Diffstat (limited to 'drivers/net/wireless/iwlwifi/Kconfig')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/Kconfig | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index d1af938b9aa..24c3e3ddafc 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig @@ -24,18 +24,10 @@ 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 n + depends on IWL4965 ---help--- This option enables IEEE 802.11n High Throughput features for the iwl4965 driver. @@ -105,13 +97,6 @@ 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 |