diff -r 896cb0d36c1a -r 3f3774e7e3b4 config/libc/glibc-eglibc.in-common
--- a/config/libc/glibc-eglibc.in-common	Sun May 08 19:02:44 2011 +0200
+++ b/config/libc/glibc-eglibc.in-common	Mon May 09 20:15:39 2011 +0200
@@ -1,8 +1,6 @@
 # This file contains the common configuration options
 # that apply to both glibc and eglibc.
 
-if LIBC_glibc || LIBC_eglibc
-
 # Some architectures require the ports addon. List them one by one here:
 # This list must be carefully in sync with the architectures names
 # we can find in config/arch/*
@@ -18,8 +16,6 @@
     default y
     select BINUTILS_FORCE_LD_BFD
 
-comment "glibc/eglibc common options"
-
 config LIBC_GLIBC_EXTRA_CONFIG
     string
     prompt "extra config"
@@ -152,7 +148,7 @@
 
 if KERNEL_linux
 
-choice
+choice LIBC_GLIBC_SUPPORTED_KERNEL
     bool
     prompt "Minimum supported kernel version"
     default LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
@@ -247,5 +243,3 @@
     default LIBC_GLIBC_MIN_KERNEL_VERSION if LIBC_GLIBC_KERNEL_VERSION_CHOSEN
 
 endif # KERNEL_linux
-
-endif # LIBC_glibc || LIBC_eglibc