From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 22 Feb 2011 20:10:22 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: master-2011-02-22
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce;p=~andy%2Flinux

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
---

5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce
diff --cc net/mac80211/Kconfig
index c766056d048,4c57a9c3729..dbf5e4006bc
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@@ -17,10 -17,10 +17,10 @@@ comment "CFG80211 needs to be enabled f
  if MAC80211 != n
  
  config MAC80211_HAS_RC
- 	def_bool n
+ 	bool
  
  config MAC80211_RC_PID
 -	bool "PID controller based rate control algorithm" if EMBEDDED
 +	bool "PID controller based rate control algorithm" if EXPERT
  	select MAC80211_HAS_RC
  	---help---
  	  This option enables a TX rate control algorithm for