diff -r 444d434c658f -r f357bc3abfa6 config/kernel/linux.in
--- a/config/kernel/linux.in	Thu May 27 10:36:03 2010 +0200
+++ b/config/kernel/linux.in	Tue Jun 15 20:04:01 2010 +0200
@@ -20,14 +20,6 @@
 
 if KERNEL_LINUX_INSTALL
 
-config KERNEL_LINUX_INSTALL_CHECK
-    bool
-    prompt "Check installed headers"
-    default y
-    help
-      If you are in doubt that installed headers are buggy, say 'Y'
-      here to have an extra check passed onto the headers.
-
 choice
     bool
     prompt "Linux kernel version"
@@ -140,11 +132,19 @@
     default 1 if KERNEL_LINUX_VERBOSITY_1
     default 2 if KERNEL_LINUX_VERBOSITY_2
 
-endif
+config KERNEL_LINUX_INSTALL_CHECK
+    bool
+    prompt "Check installed headers"
+    default y
+    help
+      If you are in doubt that installed headers are buggy, say 'Y'
+      here to have an extra check passed onto the headers.
+
+endif # KERNEL_LINUX_INSTALL
 
 config KERNEL_LINUX_USE_CUSTOM_HEADERS
     bool
-    prompt "Use custom headers"
+    prompt "custom, and/or pre-installed, headers tree"
     help
       If you have some kernel headers lying around, you can enter the path
       below.
@@ -175,6 +175,6 @@
     help
       See KERNEL_LINUX_CUSTOM_IS_TARBALL, above.
 
-endif # KERNEL_LINUX_USE_CUSTOM_DIR
+endif # KERNEL_LINUX_USE_CUSTOM_HEADERS
 
 endchoice