1.1 --- a/config/kernel/linux.in	Thu Apr 17 21:04:23 2008 +0000
     1.2 +++ b/config/kernel/linux.in	Wed Sep 10 21:40:23 2008 +0000
     1.3 @@ -11,27 +11,6 @@
     1.4        This will make use of the new headers_install rule in recent kernels.
     1.5        This is most probably what you want to use.
     1.6  
     1.7 -config KERNEL_LINUX_HEADERS_SANITISED
     1.8 -    bool
     1.9 -    prompt "Mazur's sanitized headers (OBSOLETE)"
    1.10 -    depends on OBSOLETE
    1.11 -    select KERNEL_LINUX_NEEDS_CONFIG
    1.12 -    help
    1.13 -      M. Mazur used to maintain a tree of sanitised headers, but it is now
    1.14 -      obsoleted by the headers_install rule (above), and has not seen any
    1.15 -      update since 2.6.12
    1.16 -
    1.17 -config KERNEL_LINUX_HEADERS_COPY
    1.18 -    bool
    1.19 -    prompt "pure kernel headers (REALLY OBSOLETE)"
    1.20 -    depends on OBSOLETE
    1.21 -    select KERNEL_LINUX_NEEDS_CONFIG
    1.22 -    help
    1.23 -      This will simply copy the kernel headers to the toolchain.
    1.24 -
    1.25 -      You do NOT want this. It's badly broken because it leaks kernel internals
    1.26 -      to userspace.
    1.27 -
    1.28  config KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR
    1.29      bool
    1.30      prompt "Use custom directory"
    1.31 @@ -41,11 +20,6 @@
    1.32  
    1.33  endchoice
    1.34  
    1.35 -config KERNEL
    1.36 -    string
    1.37 -    default "linux" if ! KERNEL_LINUX_HEADERS_SANITISED
    1.38 -    default "linux-libc-headers" if KERNEL_LINUX_HEADERS_SANITISED
    1.39 -
    1.40  config KERNEL_VERSION_SEE_EXTRAVERSION
    1.41      bool
    1.42      prompt "See extra versions"
    1.43 @@ -64,14 +38,6 @@
    1.44  source config/kernel/linux_headers_install.in
    1.45  endif
    1.46  
    1.47 -if KERNEL_LINUX_HEADERS_COPY
    1.48 -source config/kernel/linux_headers_copy.in
    1.49 -endif
    1.50 -
    1.51 -if KERNEL_LINUX_HEADERS_SANITISED
    1.52 -source config/kernel/linux_headers_sanitised.in
    1.53 -endif
    1.54 -
    1.55  config KERNEL_LINUX_HEADERS_CUSTOM_DIR
    1.56      string
    1.57      prompt "Where are those custom headers?"
    1.58 @@ -116,19 +82,4 @@
    1.59      default 1 if KERNEL_LINUX_VERBOSITY_1
    1.60      default 2 if KERNEL_LINUX_VERBOSITY_2
    1.61  
    1.62 -config KERNEL_LINUX_NEEDS_CONFIG
    1.63 -    bool
    1.64 -    default n
    1.65 -
    1.66 -config KERNEL_LINUX_CONFIG_FILE
    1.67 -    string
    1.68 -    prompt "Configuration file"
    1.69 -    depends on KERNEL_LINUX_NEEDS_CONFIG
    1.70 -    default ""
    1.71 -    help
    1.72 -      Path to a kernel configuration file.
    1.73 -      
    1.74 -      If you don't provide one, then the default configuration for
    1.75 -      your target will be used.
    1.76 -
    1.77  endif