X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2FuClibc%2FConfig.in;h=f6d3537531f675fd89ebb5831c392f73d40413b1;hb=d47683e4fdf0dcf827effee36a2f6a38a0a6cf9b;hp=9b670bd55adc414f277f7c714fde93aa058a61c9;hpb=4f14cc665777120194de73302510657cefc75959;p=openwrt-10.03%2F.git

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 9b670bd55..f6d353753 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -3,32 +3,18 @@
 choice
 	prompt "uClibc Version"
 	depends on TOOLCHAINOPTS && USE_UCLIBC
-	default UCLIBC_VERSION_0_9_29
+	default UCLIBC_VERSION_0_9_30_1
 	help
 	  Select the version of uClibc you wish to use.
-	  Default for kernel 2.6 is 0.9.29, for kernel 2.4 it is 0.9.28 .
-
-	config UCLIBC_VERSION_SNAPSHOT
-		bool "uClibc snapshot"
-
-	config UCLIBC_VERSION_0_9_28
-		bool "uClibc 0.9.28"
 
 	config UCLIBC_VERSION_0_9_29
 		bool "uClibc 0.9.29"
 
-	config UCLIBC_VERSION_0_9_30
-		bool "uClibc 0.9.30"
+	config UCLIBC_VERSION_0_9_30_1
+		bool "uClibc 0.9.30.1"
 
-endchoice
+	config UCLIBC_VERSION_NPTL
+		bool "uClibc NPTL branch"
+		depends BROKEN
 
-config UCLIBC_EXTRA_VERSION
-	string
-	prompt "Extra uClibc version"
-	depends on TOOLCHAINOPTS && USE_UCLIBC
-	default "snapshot"   if UCLIBC_VERSION_SNAPSHOT
-	default ".2"         if UCLIBC_VERSION_0_9_28
-	default ""
-	help
-	    Default for version 0.9.28 is ".02", for daily snapshot it's just "snapshot"
-	    For all other versions the default string is empty.
+endchoice