Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6] / net / mac80211 / Kconfig

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index d2038418e2bd57d1cc687bc1cecf5f95aa57f396..80d693392b0f175e219f10c36442cba67dba9c4f 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -11,16 +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
-
-comment "QoS/HT support disabled"
-       depends on MAC80211 && !MAC80211_QOS
-comment "QoS/HT support needs CONFIG_NET_SCHED"
-       depends on MAC80211 && !NET_SCHED
-
 menu "Rate control algorithm selection"
        depends on MAC80211 != n