diff options
| author | Ingo Molnar | 2008-07-29 11:54:24 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-29 11:54:24 +0200 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /arch/x86/Kconfig | |
| parent | x86, microcode: fix module license string (diff) | |
| parent | Linux 2.6.27-rc1 (diff) | |
| download | kernel-qcow2-linux-3825c9e8d01e4310c40a3903a354c433c32a7b6f.tar.gz kernel-qcow2-linux-3825c9e8d01e4310c40a3903a354c433c32a7b6f.tar.xz kernel-qcow2-linux-3825c9e8d01e4310c40a3903a354c433c32a7b6f.zip | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 7bb461758d31..0e5bf1eddcea 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -30,6 +30,7 @@ config X86 select HAVE_FTRACE select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) select HAVE_ARCH_KGDB if !X86_VOYAGER + select HAVE_GENERIC_DMA_COHERENT if X86_32 select HAVE_EFFICIENT_UNALIGNED_ACCESS config ARCH_DEFCONFIG |