Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / net / mac80211 / Kconfig

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 11a1e7f..80d6933 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -11,19 +11,6 @@ config MAC80211
          This option enables the hardware independent IEEE 802.11
          networking stack.
 
-config MAC80211_QOS
-       def_bool y
-       depends on MAC80211
-       depends on NET_SCHED
-       depends on NETDEVICES_MULTIQUEUE
-
-comment "QoS/HT support disabled"
-       depends on MAC80211 && !MAC80211_QOS
-comment "QoS/HT support needs CONFIG_NET_SCHED"
-       depends on MAC80211 && !NET_SCHED
-comment "QoS/HT support needs CONFIG_NETDEVICES_MULTIQUEUE"
-       depends on MAC80211 && !NETDEVICES_MULTIQUEUE
-
 menu "Rate control algorithm selection"
        depends on MAC80211 != n
 
@@ -207,7 +194,6 @@ config MAC80211_LOWTX_FRAME_DUMP
 
 config MAC80211_DEBUG_COUNTERS
        bool "Extra statistics for TX/RX debugging"
-       depends on MAC80211_DEBUG
        depends on MAC80211_DEBUG_MENU
        depends on MAC80211_DEBUGFS
        ---help---
@@ -219,7 +205,7 @@ config MAC80211_DEBUG_COUNTERS
 
 config MAC80211_VERBOSE_SPECT_MGMT_DEBUG
        bool "Verbose Spectrum Management (IEEE 802.11h)debugging"
-       depends on MAC80211_DEBUG
+       depends on MAC80211_DEBUG_MENU
        ---help---
          Say Y here to print out verbose Spectrum Management (IEEE 802.11h)
          debug messages.