Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[muen/linux.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 13c988009b2d41097962713886f47745d47a05e2..5a02dd608f74c2aeee68fa300e0ca7f5ff614d7a 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -14,7 +14,6 @@ config X86_32
        select ARCH_WANT_IPC_PARSE_VERSION
        select CLKSRC_I8253
        select CLONE_BACKWARDS
-       select HAVE_AOUT
        select HAVE_GENERIC_DMA_COHERENT
        select MODULES_USE_ELF_REL
        select OLD_SIGACTION
@@ -2844,6 +2843,7 @@ config IA32_EMULATION
 config IA32_AOUT
        tristate "IA32 a.out support"
        depends on IA32_EMULATION
+       depends on BROKEN
        ---help---
          Support old a.out binaries in the 32bit emulation.