refresh kernel patches so that they apply cleanly

[openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 55ab7e5..ffbf9de 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,37 +2,20 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS

-       default GCC_VERSION_4_1_1 if LINUX_2_6_ARUBA
-       default GCC_VERSION_3_4_6
+       default GCC_VERSION_3_4_6 if LINUX_2_4
+       default GCC_VERSION_4_1_2

        help
          Select the version of gcc you wish to use.
 
        help
          Select the version of gcc you wish to use.
 

-
-       config GCC_VERSION_3_4_4
-               bool "gcc 3.4.4"
-
-       config GCC_VERSION_3_4_5
-               bool "gcc 3.4.5"
-

        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 
        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 

-       config GCC_VERSION_3_4_6_nonmips
-               bool "gcc 3.4.6-nonmips"
-
-       config GCC_VERSION_4_0_2
-               bool "gcc 4.0.2"
-
-       config GCC_VERSION_4_0_3
-               bool "gcc 4.0.3"
-
-       config GCC_VERSION_4_1_0
-               bool "gcc 4.1.0"
-
-       config GCC_VERSION_4_1_1
-               bool "gcc 4.1.1"
+       config GCC_VERSION_4_1_2
+               depends !LINUX_2_4
+               bool "gcc 4.1.2"

 
        config GCC_VERSION_4_2
 
        config GCC_VERSION_4_2

+               depends !LINUX_2_4

                bool "gcc 4.2 (20060709)"
 
 endchoice
                bool "gcc 4.2 (20060709)"
 
 endchoice