Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig
index 44dccfd845f848436125ebfe072d93e777576204..964dfa36d3679155bcbf4de5068c08ad264c867d 100644 (file)
--- a/arch/x86/lguest/Kconfig
+++ b/arch/x86/lguest/Kconfig
@@ -1,9 +1,16 @@
 config LGUEST_GUEST
        bool "Lguest guest support"
        select PARAVIRT
+       depends on X86_32
        depends on !X86_PAE
+       depends on !(X86_VISWS || X86_VOYAGER)
+       select VIRTIO
        select VIRTIO_RING
+       select VIRTIO_CONSOLE
        help
          Lguest is a tiny in-kernel hypervisor.  Selecting this will
          allow your kernel to boot under lguest.  This option will increase
          your kernel size by about 6k.  If in doubt, say N.
+
+         If you say Y here, make sure you say Y (or M) to the virtio block
+         and net drivers which lguest needs.