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

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

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a7e7a60602fb216d96342e88207c50833c1ef26f..90b562a34d6546742578893dfe605f574829af69 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
@@ -47,6 +46,7 @@ config X86
        select ACPI_LEGACY_TABLES_LOOKUP        if ACPI
        select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
        select ANON_INODES
+       select ARCH_32BIT_OFF_T                 if X86_32
        select ARCH_CLOCKSOURCE_DATA
        select ARCH_CLOCKSOURCE_INIT
        select ARCH_DISCARD_MEMBLOCK
@@ -2840,6 +2840,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.