diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 15:13:20 -0400 |
| commit | f6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c (patch) | |
| tree | c5643fcdc884a8d0bfc3f1bc28039cab7394e5bc /arch/x86/lguest/Kconfig | |
| parent | 323ec001c6bb98eeabb5abbdbb8c8055d9496554 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/lguest/Kconfig')
| -rw-r--r-- | arch/x86/lguest/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig index 964dfa36d367..c70e12b1a637 100644 --- a/arch/x86/lguest/Kconfig +++ b/arch/x86/lguest/Kconfig | |||
| @@ -3,7 +3,7 @@ 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_VISWS || X86_VOYAGER) | 6 | depends on !X86_VOYAGER |
| 7 | select VIRTIO | 7 | select VIRTIO |
| 8 | select VIRTIO_RING | 8 | select VIRTIO_RING |
| 9 | select VIRTIO_CONSOLE | 9 | select VIRTIO_CONSOLE |