[package] mac80211: make b43-fwsquash.py work with python 3.x

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index b19427b..9562a02 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,7 +3,7 @@
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
        default GCC_VERSION_3_4_6 if LINUX_2_4
-       default GCC_VERSION_4_2_4 if TARGET_avr32
+       default GCC_VERSION_4_2_4 if avr32
        default GCC_VERSION_4_2_4 if TARGET_ppc40x
        default GCC_VERSION_4_2_4 if TARGET_ppc44x
        default GCC_VERSION_4_3_3 if powerpc64
@@ -11,7 +11,7 @@ choice
        default GCC_VERSION_4_3_3 if TARGET_coldfire
        default GCC_VERSION_4_4_1 if ubicom32
        default GCC_VERSION_4_4_1 if TARGET_octeon
-       default GCC_VERSION_4_3_3_CS if mips || mipsel
+       default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !TARGET_octeon
        default GCC_VERSION_4_3_3_CS if arm || armeb
        default GCC_VERSION_4_1_2
        help