2 files changed, 2 insertions, 9 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 4dc9b2d14b9..ae071a11ce7 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -118,13 +118,6 @@ config SYSVIPC_COMPAT
         depends on COMPAT && SYSVIPC
         default y
 
-config BINFMT_ELF32
-        bool "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"
 
 choice
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index eabf00a6f77..86601a94570 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -17,8 +17,8 @@ obj-$(CONFIG_MODULES)		+= s390_ksyms.o module.o
 obj-$(CONFIG_SMP)               += smp.o
 
 obj-$(CONFIG_COMPAT)            += compat_linux.o compat_signal.o \
-                                        compat_wrapper.o compat_exec_domain.o
-obj-$(CONFIG_BINFMT_ELF32)      += binfmt_elf32.o
+                                        compat_wrapper.o compat_exec_domain.o \
+                                        binfmt_elf32.o
 
 obj-$(CONFIG_VIRT_TIMER)        += vtime.o
 obj-$(CONFIG_STACKTRACE)        += stacktrace.o