diff options
| author |  John W. Linville <linville@tuxdriver.com>
| 2011-03-04 14:10:40 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com>
| 2011-03-04 14:10:40 -0500 |
| commit | 85a7045a90052749885e166f40af5e9140032287 (patch) | |
| tree | cb4702d50bbe1d10ab9320ad3f63323b817727f7 /net/mac80211/Kconfig | |
| parent | ipv6: Use ERR_CAST in addrconf_dst_alloc. (diff) | |
| parent | mac80211: make rate control Kconfig warning depend on mac80211 (diff) | |
| download | linux-85a7045a90052749885e166f40af5e9140032287.tar.gz linux-85a7045a90052749885e166f40af5e9140032287.tar.bz2 linux-85a7045a90052749885e166f40af5e9140032287.zip | |
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 dbf5e4006bc1..513f85cc2ae1 100644 --- a/net/mac80211/Kconfig +++ b/net/mac80211/Kconfig @@ -78,7 +78,7 @@ config MAC80211_RC_DEFAULT endif comment "Some wireless drivers require a rate control algorithm" - depends on MAC80211_HAS_RC=n + depends on MAC80211 && MAC80211_HAS_RC=n config MAC80211_MESH bool "Enable mac80211 mesh networking (pre-802.11s) support" |