summaryrefslogtreecommitdiffstats
path: root/net/mac80211/Kconfig
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-03-04 14:10:40 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-03-04 14:10:40 -0500
commit85a7045a90052749885e166f40af5e9140032287 (patch)
treecb4702d50bbe1d10ab9320ad3f63323b817727f7 /net/mac80211/Kconfig
parent29546a6404e3a4b5d13f0a9586eb5cf1c3b25167 (diff)
parente46395a4b3d32d161d8b6d8e4a002972b1faae3e (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/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index dbf5e4006bc..513f85cc2ae 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"