OMAP2xxx clock: init osc_ck, sys_ck internal lists early

[linux-2.6-omap-h63xx.git] / net / mac80211 / Kconfig

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 7f710a27e91c9feac7681e0272de95bd3cf0bf55..60c16162474c23edbcfe4e338f9e00b4a6b6a0df 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -16,20 +16,20 @@ menu "Rate control algorithm selection"
 
 config MAC80211_RC_PID
        bool "PID controller based rate control algorithm" if EMBEDDED
-       default y
        ---help---
          This option enables a TX rate control algorithm for
          mac80211 that uses a PID controller to select the TX
          rate.
 
 config MAC80211_RC_MINSTREL
-       bool "Minstrel"
+       bool "Minstrel" if EMBEDDED
+       default y
        ---help---
          This option enables the 'minstrel' TX rate control algorithm
 
 choice
        prompt "Default rate control algorithm"
-       default MAC80211_RC_DEFAULT_PID
+       default MAC80211_RC_DEFAULT_MINSTREL
        ---help---
          This option selects the default rate control algorithm
          mac80211 will use. Note that this default can still be
@@ -55,8 +55,8 @@ endchoice
 
 config MAC80211_RC_DEFAULT
        string
-       default "pid" if MAC80211_RC_DEFAULT_PID
        default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL
+       default "pid" if MAC80211_RC_DEFAULT_PID
        default ""
 
 endmenu