Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

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

diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 43d901fdc77f714dd44203e178835a6a61464bae..fd6925f41647acf48a9af59c14a78e86569974e9 100644 (file)
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST
        tristate "Linux hypervisor example code"
-       depends on X86 && PARAVIRT && NET && EXPERIMENTAL && !X86_PAE
+       depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE
        select LGUEST_GUEST
        select HVC_DRIVER
        ---help---
@@ -18,3 +18,13 @@ 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