Merge branch 'linus' into x86/urgent

[pandora-kernel.git] / drivers / lguest / Kconfig

diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 7eb9ecf..76f2b36 100644 (file)
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST
        tristate "Linux hypervisor example code"
-       depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
+       depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !X86_VOYAGER
        select HVC_DRIVER
        ---help---
          This is a very simple module which allows you to run
@@ -10,10 +10,3 @@ config LGUEST
          not "rustyvisor".  See Documentation/lguest/lguest.txt.
 
          If unsure, say N.  If curious, say M.  If masochistic, say Y.
-
-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.