Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[powerpc.git] / drivers / lguest / Kconfig

diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 43d901f..002d4f4 100644 (file)
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,8 +1,8 @@
 config LGUEST
        tristate "Linux hypervisor example code"
-       depends on X86 && PARAVIRT && NET && EXPERIMENTAL && !X86_PAE
-       select LGUEST_GUEST
+       depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
        select HVC_DRIVER
+       select LGUEST_GUEST
        ---help---
          This is a very simple module which allows you to run
          multiple instances of the same Linux kernel, using the
@@ -16,5 +16,4 @@ config LGUEST_GUEST
        bool
        help
          The guest needs code built-in, even if the host has lguest
-         support as a module.  The drivers are tiny, so we build them
-         in too.
+         support as a module.