[Lguest] linux-next: Tree for Feb 18 (x86)

[Rusty Russell]

Randy Dunlap <rdunlap at infradead.org> writes:
> On 02/18/15 10:46, Randy Dunlap wrote:
>> On 02/17/15 19:22, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Please do not add any material destined for v3.21 to your linux-next
>>> included trees until after v3.20-rc1 has been released.
>>>
>>> Changes since 20150217:
>>>
>> 
>> 
>> on i386, when CONFIG_PCI is not enabled:
>
> This is all lguest-related.  Looks like LGUEST_GUEST should also
> depend on PCI (in arch/x86/lguest/Kconfig).

I've committed this to my fixes branch.

Thanks,
Rusty.

lguest: now depends on PCI

Reported-by: Randy Dunlap <rdunlap at infradead.org>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig
index 4a0890f815c4..21e89807244c 100644
--- a/arch/x86/lguest/Kconfig
+++ b/arch/x86/lguest/Kconfig
@@ -1,6 +1,6 @@
 config LGUEST_GUEST
 	bool "Lguest guest support"
-	depends on X86_32 && PARAVIRT
+	depends on X86_32 && PARAVIRT && PCI
 	select TTY
 	select VIRTUALIZATION
 	select VIRTIO