Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 3 deletions

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 9109262abd24..c766056d0488 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -20,7 +20,7 @@ config MAC80211_HAS_RC
         def_bool n
 
 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
@@ -28,14 +28,14 @@ config MAC80211_RC_PID
           rate.
 
 config MAC80211_RC_MINSTREL
-        bool "Minstrel" if EMBEDDED
+        bool "Minstrel" if EXPERT
         select MAC80211_HAS_RC
         default y
         ---help---
           This option enables the 'minstrel' TX rate control algorithm
 
 config MAC80211_RC_MINSTREL_HT
-        bool "Minstrel 802.11n support" if EMBEDDED
+        bool "Minstrel 802.11n support" if EXPERT
         depends on MAC80211_RC_MINSTREL
         default y
         ---help---