Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: add support for the latest Intel processors to Oprofile
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 7eb9ecf..002d4f4 100644
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -2,6 +2,7 @@
tristate "Linux hypervisor example code"
depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
select HVC_DRIVER
+ select LGUEST_GUEST
---help---
This is a very simple module which allows you to run
multiple instances of the same Linux kernel, using the
@@ -15,5 +16,4 @@
bool
help
The guest needs code built-in, even if the host has lguest
- support as a module. The drivers are tiny, so we build them
- in too.
+ support as a module.