diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
| commit | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (patch) | |
| tree | b5e5787a6d5c15e589d275c7434ebbf341257234 /net/mac80211/Kconfig | |
| parent | db62983a1e4b2af9e79c97af768f0c8b80bd93f0 (diff) | |
| parent | 320d6c1b56de5f461c6062625b9664095f90ee95 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/mac80211/Kconfig')
| -rw-r--r-- | net/mac80211/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig index c766056d0488..dbf5e4006bc1 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig | |||
| @@ -17,7 +17,7 @@ comment "CFG80211 needs to be enabled for MAC80211" | |||
| 17 | if MAC80211 != n | 17 | if MAC80211 != n |
| 18 | 18 | ||
| 19 | config MAC80211_HAS_RC | 19 | config MAC80211_HAS_RC |
| 20 | def_bool n | 20 | bool |
| 21 | 21 | ||
| 22 | config MAC80211_RC_PID | 22 | config MAC80211_RC_PID |
| 23 | bool "PID controller based rate control algorithm" if EXPERT | 23 | bool "PID controller based rate control algorithm" if EXPERT |