diff --git a/[refs] b/[refs] index 8fcaa2f0edb3..a3416804c4e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d8ae3fdeb001b8f534a6782c261aba6ec1779f5 +refs/heads/master: 24344d2600108b9b79a60c0e4c43b3c499856d14 diff --git a/trunk/net/mac80211/Kconfig b/trunk/net/mac80211/Kconfig index d2038418e2bd..10579def490b 100644 --- a/trunk/net/mac80211/Kconfig +++ b/trunk/net/mac80211/Kconfig @@ -15,6 +15,7 @@ config MAC80211_QOS def_bool y depends on MAC80211 depends on NET_SCHED + depends on BROKEN comment "QoS/HT support disabled" depends on MAC80211 && !MAC80211_QOS