diff -r efe5f40c84c1 -r 242695a00db5 config/kernel/linux.in
--- a/config/kernel/linux.in	Mon Aug 08 21:21:38 2011 +0200
+++ b/config/kernel/linux.in	Sun Aug 14 16:05:33 2011 +0200
@@ -4,20 +4,10 @@
 ##
 ## help Build a toolchain targeting systems running Linux as a kernel.
 
-choice
-    bool
-    prompt "Get kernel headers from:"
-
-config KERNEL_LINUX_INSTALL
-    bool
-    prompt "kernel's 'headers_install'"
-    help
-      This will make use of the new headers_install rule in recent kernels.
-      This is most probably what you want to use.
-
 config KERNEL_LINUX_USE_CUSTOM_HEADERS
     bool
-    prompt "pre-installed headers tree"
+    prompt "Use pre-installed headers tree (OBSOLETE)"
+    depends on OBSOLETE
     help
       If you have some pre-installed kernel headers lying around, you can
       enter the path to these headers, below, they will be copied from
@@ -25,10 +15,12 @@
       
       Note:
       This will *not* let you use a complete kernel tree!
-      If you want to use your own full kernel tree, then you want to
-      say 'Y' to KERNEL_LINUX_INSTALL, above, and select KERNEL_LINUX_CUSTOM.
+      If you want to use your own full kernel tree, then you want to say 'N'
+      here, and select KERNEL_LINUX_CUSTOM, in the versions list, below.
 
-endchoice
+config KERNEL_LINUX_INSTALL
+    bool
+    default y if ! KERNEL_LINUX_USE_CUSTOM_HEADERS
 
 if KERNEL_LINUX_INSTALL