ath9k: merge another round of upstream (or -pending) fixes and cleanups

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

diff --git a/toolchain/eglibc/Config.in b/toolchain/eglibc/Config.in
index 3caea39..7910336 100644 (file)
--- a/toolchain/eglibc/Config.in
+++ b/toolchain/eglibc/Config.in
@@ -1,40 +1,33 @@
 choice
-       prompt "eglibc version" 
+       prompt "eglibc version"
        depends on TOOLCHAINOPTS && USE_EGLIBC
-       default EGLIBC_VERSION_2_8
+       default EGLIBC_USE_VERSION_2_15
        help
          Select the version of eglibc you wish to use.
 
-       config EGLIBC_VERSION_2_6_1
-               bool "eglibc 2.6.1"
+       config EGLIBC_USE_VERSION_2_15
+               bool "eglibc 2.15"
+               select EGLIBC_VERSION_2_15
 
-       config EGLIBC_VERSION_2_7
-               bool "eglibc 2.7"
+       config EGLIBC_USE_VERSION_2_16
+               bool "eglibc 2.16"
+               select EGLIBC_VERSION_2_16
 
-       config EGLIBC_VERSION_2_8
-               bool "eglibc 2.8"
-
-       config EGLIBC_VERSION_2_9
-               bool "eglibc 2.9"
-
-       config EGLIBC_VERSION_TRUNK
-               bool "eglibc trunk"
+       config EGLIBC_USE_VERSION_2_17
+               bool "eglibc 2.17"
+               select EGLIBC_VERSION_2_17
 
 endchoice
 
 config EGLIBC_REVISION
        string
-       prompt "eglibc revision"
        depends on TOOLCHAINOPTS && USE_EGLIBC
-       default "5887"  if EGLIBC_VERSION_2_6_1
-       default "5886"  if EGLIBC_VERSION_2_7
-       default "6913"  if EGLIBC_VERSION_2_8
-       default "7430"  if EGLIBC_VERSION_2_9
-       default "HEAD"  if EGLIBC_VERSION_TRUNK
+       default "18909" if EGLIBC_VERSION_2_15
+       default "21110" if EGLIBC_VERSION_2_16
+       default "22243" if EGLIBC_VERSION_2_17
        default ""
 
 menu "eglibc configuration"
        depends on TOOLCHAINOPTS && USE_EGLIBC
        source toolchain/eglibc/config/Config.in
 endmenu
-