diff --git a/[refs] b/[refs] index 4211df36b05a..71cd47c29a0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f3ad8943e2e6336ba229b208be8c7a80730c5d4 +refs/heads/master: d52a60ad389d8aeac162350b19e4303c6cde7f93 diff --git a/trunk/net/mac80211/Kconfig b/trunk/net/mac80211/Kconfig index 32c8c08c4683..ce176e691afe 100644 --- a/trunk/net/mac80211/Kconfig +++ b/trunk/net/mac80211/Kconfig @@ -14,9 +14,9 @@ config MAC80211 networking stack. config MAC80211_RCSIMPLE - bool "'simple' rate control algorithm" + bool "'simple' rate control algorithm" if EMBEDDED default y - depends on MAC80211 && EMBEDDED + depends on MAC80211 help This option allows you to turn off the 'simple' rate control algorithm in mac80211. If you do turn it off,