linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 46569b7..13dbfd3 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -7,14 +7,6 @@ config MMU
        bool
        default y
 
-config LOCKDEP_SUPPORT
-       bool
-       default y
-
-config STACKTRACE_SUPPORT
-       bool
-       default y
-
 config RWSEM_GENERIC_SPINLOCK
        bool
 
@@ -22,10 +14,6 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
-config GENERIC_HWEIGHT
-       bool
-       default y
-
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -51,10 +39,6 @@ config 64BIT
          Select this option if you have a 64 bit IBM zSeries machine
          and want to use the 64 bit addressing mode.
 
-config 32BIT
-       bool
-       default y if !64BIT
-
 config SMP
        bool "Symmetric multi-processing support"
        ---help---
@@ -122,9 +106,12 @@ config SYSVIPC_COMPAT
        depends on COMPAT && SYSVIPC
        default y
 
-config AUDIT_ARCH
-       bool
-       default y
+config BINFMT_ELF32
+       tristate "Kernel support for 31 bit ELF binaries"
+       depends on COMPAT
+       help
+         This allows you to run 32-bit Linux/ELF binaries on your zSeries
+         in 64 bit mode. Everybody wants this; say Y.
 
 comment "Code generation options"
 
@@ -455,14 +442,6 @@ config NO_IDLE_HZ_INIT
          The HZ timer is switched off in idle by default. That means the
          HZ timer is already disabled at boot time.
 
-config S390_HYPFS_FS
-       bool "s390 hypervisor file system support"
-       select SYS_HYPERVISOR
-       default y
-       help
-         This is a virtual file system intended to provide accounting
-         information in an s390 hypervisor environment.
-
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
        depends on EXPERIMENTAL
@@ -481,8 +460,6 @@ config PCMCIA
 
 source "drivers/base/Kconfig"
 
-source "drivers/connector/Kconfig"
-
 source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"