mac80211: merge setup script fix from r29606

[openwrt-10.03/.git] / toolchain / binutils / Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 7b5127b46f3575228269bfbb268763afedf0a964..6bd78ad643e309069458d3c52870042bb0ea3469 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -4,7 +4,7 @@ choice
        prompt "Binutils Version" if TOOLCHAINOPTS
        default BINUTILS_VERSION_2_19_1
        help
-         Select the version of binutils you wish to use.
+           Select the version of binutils you wish to use.
 
        config BINUTILS_VERSION_2_18
                depends !ubicom32
@@ -13,20 +13,10 @@ choice
        config BINUTILS_VERSION_2_19_1
                bool "binutils 2.19.1"
 
-       config BINUTILS_VERSION_2_20
+       config BINUTILS_VERSION_2_20_1
                depends !avr32
                depends !ubicom32
-               bool "binutils 2.20"
-        config BINUTILS_VERSION_2_20_1
-                depends !avr32
-                depends !ubicom32
-                bool "binutils 2.20.1"
-
-       config BINUTILS_VERSION_CS
-               depends !avr32
-               depends !ubicom32
-               depends BROKEN
-               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+               bool "binutils 2.20.1"
 
 endchoice
 
@@ -42,7 +32,5 @@ config BINUTILS_VERSION
        prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
        default "2.18"            if BINUTILS_VERSION_2_18
        default "2.19.1"          if BINUTILS_VERSION_2_19_1
-       default "2.20"            if BINUTILS_VERSION_2_20
        default "2.20.1"          if BINUTILS_VERSION_2_20_1
-       default "2.19.1+cs"       if BINUTILS_VERSION_CS
        default "2.19.1"