Merge branch 'core/rcu' into core/rcu-for-linus

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

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 3c3f62faae1e7158a16f5cab3d756bdb50880240..a24b459dd45aecf9ba8e1214fce68fe2b8330c6c 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -32,15 +32,6 @@ config MAC80211_RC_DEFAULT_PID
          default rate control algorithm. You should choose
          this unless you know what you are doing.
 
-config MAC80211_RC_DEFAULT_SIMPLE
-       bool "Simple rate control algorithm"
-       select MAC80211_RC_SIMPLE
-       ---help---
-         Select the simple rate control as the default rate
-         control algorithm. Note that this is a non-responsive,
-         dumb algorithm. You should choose the PID rate control
-         instead.
-
 config MAC80211_RC_DEFAULT_NONE
        bool "No default algorithm"
        depends on EMBEDDED
@@ -57,7 +48,6 @@ comment "build the algorithm into mac80211."
 config MAC80211_RC_DEFAULT
        string
        default "pid" if MAC80211_RC_DEFAULT_PID
-       default "simple" if MAC80211_RC_DEFAULT_SIMPLE
        default ""
 
 config MAC80211_RC_PID
@@ -70,15 +60,6 @@ config MAC80211_RC_PID
          Say Y or M unless you're sure you want to use a
          different rate control algorithm.
 
-config MAC80211_RC_SIMPLE
-       tristate "Simple rate control algorithm (DEPRECATED)"
-       ---help---
-         This option enables a very simple, non-responsive TX
-         rate control algorithm. This algorithm is deprecated
-         and will be removed from the kernel in the near future.
-         It has been replaced by the PID algorithm.
-
-         Say N unless you know what you are doing.
 endmenu
 
 config MAC80211_MESH
@@ -92,7 +73,9 @@ config MAC80211_MESH
 
 config MAC80211_LEDS
        bool "Enable LED triggers"
-       depends on MAC80211 && LEDS_TRIGGERS
+       depends on MAC80211
+       select NEW_LEDS
+       select LEDS_TRIGGERS
        ---help---
          This option enables a few LED triggers for different
          packet receive/transmit events.