diff --git a/[refs] b/[refs] index 14f1e3a15cef..9e064d52006f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 306a22c2a20edf3a440bfb4cf2b94c19dfd81a53 +refs/heads/master: f0f32fccbffaaba8596d5c671153aa37aea9d4f0 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index c2362c7ba749..0d67a0a1151e 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -190,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