From 381156e2f39f300c5937645f5a3d696f401c9e12 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Wed, 28 Nov 2007 16:22:09 -0800 Subject: [PATCH] --- yaml --- r: 74392 b: refs/heads/master c: b8415ec34fd63c6260497b2f8aaf3ce7a61eaa8a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/lguest/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a9895ff79294..b7c2252f7712 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbb43ab03c1fa7587476910d346ee11882b4cc62 +refs/heads/master: b8415ec34fd63c6260497b2f8aaf3ce7a61eaa8a diff --git a/trunk/arch/x86/lguest/Kconfig b/trunk/arch/x86/lguest/Kconfig index c4dffbeea5e1..19626ace0f50 100644 --- a/trunk/arch/x86/lguest/Kconfig +++ b/trunk/arch/x86/lguest/Kconfig @@ -2,6 +2,7 @@ config LGUEST_GUEST bool "Lguest guest support" select PARAVIRT depends on !X86_PAE + depends on !(X86_VISWS || X86_VOYAGER) select VIRTIO select VIRTIO_RING select VIRTIO_CONSOLE