diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 14:18:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 14:18:09 -0700 |
| commit | 3f968de276a8e585deb182d4ba56013a479c80bc (patch) | |
| tree | bff8932bb5e64c22708aad48a6edbef3a707a774 /net/mac80211 | |
| parent | 5ca1b998d33c39819fca2b675d80c4469e705f2d (diff) | |
| parent | d0bec34293bb0b8dddc26d25bd46a6631d6b3ec3 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index 9db4ff836a3..4d5543af312 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig @@ -13,8 +13,7 @@ config MAC80211 comment "CFG80211 needs to be enabled for MAC80211" depends on CFG80211=n -menu "Rate control algorithm selection" - depends on MAC80211 != n +if MAC80211 != n config MAC80211_RC_PID bool "PID controller based rate control algorithm" if EMBEDDED @@ -61,7 +60,7 @@ config MAC80211_RC_DEFAULT default "pid" if MAC80211_RC_DEFAULT_PID default "" -endmenu +endif config MAC80211_MESH bool "Enable mac80211 mesh networking (pre-802.11s) support" |