diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-03-12 21:12:46 -0400 |
|---|---|---|
| committer | Steven Rostedt <srostedt@redhat.com> | 2009-03-12 21:12:46 -0400 |
| commit | 51b643b404827d8fde60d7953773a42d46ca87e0 (patch) | |
| tree | ae71fcbd8b3640b68fc11e1dca620a8ee96bac5f /arch/x86/lguest/Kconfig | |
| parent | 554f786e284a6ce859d51f62240d615603944c8e (diff) | |
| parent | 480c93df5b99699390f93a7024c9f60d09da0e96 (diff) | |
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/ftrace-merge
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 select PARAVIRT depends on X86_32 depends on !X86_PAE - depends on !X86_VOYAGER select VIRTIO select VIRTIO_RING select VIRTIO_CONSOLE |