diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 12:08:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 12:08:30 -0400 |
| commit | 063402356280a7b262952d6351d21315336f657b (patch) | |
| tree | e6fae7db15d0f4cbb9b9b7aa2b5bc176b4bf60f5 /arch/x86/lguest/Kconfig | |
| parent | f9a36fa5413f1b2694841c410a6fdb4666e78f16 (diff) | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
Merge branch 'x86/core' into x86/kconfig
Diffstat (limited to 'arch/x86/lguest/Kconfig')
| -rw-r--r-- | arch/x86/lguest/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig index c70e12b1a63..8dab8f7844d 100644 --- a/arch/x86/lguest/Kconfig +++ b/arch/x86/lguest/Kconfig | |||
| @@ -3,7 +3,6 @@ config LGUEST_GUEST | |||
| 3 | select PARAVIRT | 3 | select PARAVIRT |
| 4 | depends on X86_32 | 4 | depends on X86_32 |
| 5 | depends on !X86_PAE | 5 | depends on !X86_PAE |
| 6 | depends on !X86_VOYAGER | ||
| 7 | select VIRTIO | 6 | select VIRTIO |
| 8 | select VIRTIO_RING | 7 | select VIRTIO_RING |
| 9 | select VIRTIO_CONSOLE | 8 | select VIRTIO_CONSOLE |