diff -r af75fc1fe0fc -r 8d23dc29eb7d config/kernel/linux.in
--- a/config/kernel/linux.in	Wed Sep 10 21:40:23 2008 +0000
+++ b/config/kernel/linux.in	Mon Sep 15 12:08:01 2008 +0000
@@ -20,6 +20,8 @@
 
 endchoice
 
+if KERNEL_LINUX_HEADERS_INSTALL
+
 config KERNEL_VERSION_SEE_EXTRAVERSION
     bool
     prompt "See extra versions"
@@ -27,29 +29,14 @@
     depends on KERNEL_LINUX_HEADERS_COPY || KERNEL_LINUX_HEADERS_INSTALL
     help
       See extra versions (kernel with 4 numbers, eg 2.6.19.1).
-
+       
       If you say 'no', you'll only see sub-level, 3-digit versions.
       If you say 'yes', you'll see far more versions!
-
+       
       It is recommended that you say 'no', unless you _*know*_
       that an extra version fixes a headers bug.
 
-if KERNEL_LINUX_HEADERS_INSTALL
 source config/kernel/linux_headers_install.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
@@ -83,3 +70,14 @@
     default 2 if KERNEL_LINUX_VERBOSITY_2
 
 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