1 files changed, 6 insertions, 16 deletions

diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index d1af938b9aa6..5b7c0160e1fa 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -1,7 +1,12 @@
+config IWLCORE
+        tristate "Intel Wireless Wifi Core"
+        depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+
 config IWL4965
         tristate "Intel Wireless WiFi 4965AGN"
         depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
         select FW_LOADER
+        select IWLCORE
         ---help---
           Select to build the driver supporting the:
 
@@ -24,18 +29,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 +102,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