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

[karo-tx-linux.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 47247708c9eb79bc873615799d386cbf36956935..7a01d4335029b1f49f23c22e709efe20542e7356 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -261,6 +261,9 @@ config ARCH_HWEIGHT_CFLAGS
 config ARCH_SUPPORTS_UPROBES
        def_bool y
 
+config FIX_EARLYCON_MEM
+       def_bool y
+
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
 
@@ -415,7 +418,6 @@ config X86_UV
 
 config X86_GOLDFISH
        bool "Goldfish (Virtual Platform)"
-       depends on X86_32
        depends on X86_EXTENDED_PLATFORM
        ---help---
         Enable support for the Goldfish virtual platform used primarily
@@ -2376,12 +2378,9 @@ config X86_DMA_REMAP
        depends on STA2X11
 
 config IOSF_MBI
-       bool
+       tristate
+       default m
        depends on PCI
-       ---help---
-         To be selected by modules requiring access to the Intel OnChip System
-         Fabric (IOSF) Sideband MailBox Interface (MBI). For MBI platforms
-         enumerable by PCI.
 
 source "net/Kconfig"