diff options
| author | Avi Kivity <avi@redhat.com> | 2009-12-03 02:30:06 -0500 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-03 02:30:06 -0500 |
| commit | 58988b07cfe2ebe9f9b39d973fd8a083390e749f (patch) | |
| tree | f7a164abe85b8aa768c58a80c1261208372fb4b0 /arch/x86/Kconfig | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| parent | 8e7cac79808b62f242069a6ac88d364d35621371 (diff) | |
Merge remote branch 'tip/x86/entry' into kvm-updates/2.6.33
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 72ace9515a07..8b54096e6d73 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -50,6 +50,7 @@ config X86 | |||
| 50 | select HAVE_KERNEL_BZIP2 | 50 | select HAVE_KERNEL_BZIP2 |
| 51 | select HAVE_KERNEL_LZMA | 51 | select HAVE_KERNEL_LZMA |
| 52 | select HAVE_ARCH_KMEMCHECK | 52 | select HAVE_ARCH_KMEMCHECK |
| 53 | select HAVE_USER_RETURN_NOTIFIER | ||
| 53 | 54 | ||
| 54 | config OUTPUT_FORMAT | 55 | config OUTPUT_FORMAT |
| 55 | string | 56 | string |