Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / net / mac80211 / Kconfig

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index c766056d0488eb2826def69d7ba9e923e171304f..513f85cc2ae1b1ad707f8a878fcf2fd5e6e93a91 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -17,7 +17,7 @@ comment "CFG80211 needs to be enabled for MAC80211"
 if MAC80211 != n
 
 config MAC80211_HAS_RC
-       def_bool n
+       bool
 
 config MAC80211_RC_PID
        bool "PID controller based rate control algorithm" if EXPERT
@@ -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"