Merge ../linus

[linux-drm-fsl-dcu.git] / arch / i386 / Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index ea70359b02d09660147fb5066684452c6f9c1698..0d67a0a1151e8ef263ae67d1489ea5ad98f8a1d4 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -49,6 +49,11 @@ config GENERIC_IOMAP
        bool
        default y
 
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
 config GENERIC_HWEIGHT
        bool
        default y
@@ -185,6 +190,7 @@ endchoice
 config PARAVIRT
        bool "Paravirtualization support (EXPERIMENTAL)"
        depends on EXPERIMENTAL
+       depends on !(X86_VISWS || X86_VOYAGER)
        help
          Paravirtualization is a way of running multiple instances of
          Linux on the same machine, under a hypervisor.  This option