Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[linux-2.6-omap-h63xx.git] / drivers / lguest / Kconfig

diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 002d4f4e93c6381042cfbf0e6a14cfa50134ceae..76f2b36881c3b43871533399cc242b4dfd24cd43 100644 (file)
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,8 +1,7 @@
 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
-       select LGUEST_GUEST
        ---help---
          This is a very simple module which allows you to run
          multiple instances of the same Linux kernel, using the
@@ -11,9 +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.