diff -r 08da017ba46b -r 5b3785e0d41d config/kernel/linux.in
--- a/config/kernel/linux.in	Thu Apr 17 21:04:23 2008 +0000
+++ b/config/kernel/linux.in	Thu Sep 11 09:01:48 2008 +0000
@@ -11,27 +11,6 @@
       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_HEADERS_SANITISED
-    bool
-    prompt "Mazur's sanitized headers (OBSOLETE)"
-    depends on OBSOLETE
-    select KERNEL_LINUX_NEEDS_CONFIG
-    help
-      M. Mazur used to maintain a tree of sanitised headers, but it is now
-      obsoleted by the headers_install rule (above), and has not seen any
-      update since 2.6.12
-
-config KERNEL_LINUX_HEADERS_COPY
-    bool
-    prompt "pure kernel headers (REALLY OBSOLETE)"
-    depends on OBSOLETE
-    select KERNEL_LINUX_NEEDS_CONFIG
-    help
-      This will simply copy the kernel headers to the toolchain.
-
-      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"
@@ -41,11 +20,6 @@
 
 endchoice
 
-config KERNEL
-    string
-    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"
@@ -64,14 +38,6 @@
 source config/kernel/linux_headers_install.in
 endif
 
-if KERNEL_LINUX_HEADERS_COPY
-source config/kernel/linux_headers_copy.in
-endif
-
-if KERNEL_LINUX_HEADERS_SANITISED
-source config/kernel/linux_headers_sanitised.in
-endif
-
 config KERNEL_LINUX_HEADERS_CUSTOM_DIR
     string
     prompt "Where are those custom headers?"
@@ -116,19 +82,4 @@
     default 1 if KERNEL_LINUX_VERBOSITY_1
     default 2 if KERNEL_LINUX_VERBOSITY_2
 
-config KERNEL_LINUX_NEEDS_CONFIG
-    bool
-    default n
-
-config KERNEL_LINUX_CONFIG_FILE
-    string
-    prompt "Configuration file"
-    depends on KERNEL_LINUX_NEEDS_CONFIG
-    default ""
-    help
-      Path to a kernel configuration file.
-      
-      If you don't provide one, then the default configuration for
-      your target will be used.
-
 endif