diff -r eeea35fbf182 -r 21bcbfde8094 config/kernel_linux.in
--- a/config/kernel_linux.in	Sat Feb 24 11:00:05 2007 +0000
+++ b/config/kernel_linux.in	Wed Apr 11 21:26:03 2007 +0000
@@ -28,18 +28,25 @@
       You do NOT want this. It's badly broken because it leaks kernel internals
       to userspace.
 
+config KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR
+    bool
+    prompt "Use custom directory"
+    help
+      If you have some kernel headers lying around, you can enter the path
+      below.
+
 endchoice
 
 config KERNEL
     string
-    default "linux" if KERNEL_LINUX_HEADERS_INSTALL || KERNEL_LINUX_HEADERS_COPY
+    default "linux" if ! KERNEL_LINUX_HEADERS_SANITISED
     default "linux-libc-headers" if KERNEL_LINUX_HEADERS_SANITISED
 
 config KERNEL_VERSION_SEE_EXTRAVERSION
     bool
     prompt "See extra versions"
     default n
-    depends on ! KERNEL_LINUX_HEADERS_SANITISED
+    depends on KERNEL_LINUX_HEADERS_COPY || KERNEL_LINUX_HEADERS_INSTALL
     help
       See extra versions (kernel with 4 numbers, eg 2.6.19.1).
 
@@ -61,6 +68,19 @@
 source config/kernel_linux_headers_sanitised.in
 endif
 
+config KERNEL_LINUX_HEADERS_CUSTOM_DIR
+    string
+    prompt "Where are those custom headers?"
+    depends on KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR
+    help
+      Enter the base directory where the headers are to be found.
+      
+      Eg. if the headers are in /some/place/include, then enter /some/place.
+          This is the same path you entered when you typed:
+            make INSTALL_HDR_PATH=/some/place headers_install
+
+if ! KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR
+
 choice
     bool
     prompt "Kernel verbosity:"
@@ -100,3 +120,5 @@
       Path to the kernel configuration file.
       
       You _must_ provide one (for now).
+
+endif