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

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

diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index fd6925f41647acf48a9af59c14a78e86569974e9..7eb9ecff8f4a9e4ae1a73a5904048419860aa5f3 100644 (file)
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,7 +1,6 @@
 config LGUEST
        tristate "Linux hypervisor example code"
-       depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE
-       select LGUEST_GUEST
+       depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
        select HVC_DRIVER
        ---help---
          This is a very simple module which allows you to run
@@ -18,13 +17,3 @@ config LGUEST_GUEST
          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.
-
-config LGUEST_NET
-       tristate
-       default y
-       depends on LGUEST_GUEST && NET
-
-config LGUEST_BLOCK
-       tristate
-       default y
-       depends on LGUEST_GUEST && BLOCK