diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 01:29:19 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 01:29:19 (GMT) |
| commit | 91d75e209bd59695f0708d66964d928d45b3b2f3 (patch) | |
| tree | 32cab1359d951e4193bebb181a0f0319824a2b95 /arch/x86/configs/x86_64_defconfig | |
| parent | 9976b39b5031bbf76f715893cf080b6a17683881 (diff) | |
| parent | 8b0e5860cb099d7958d13b00ffbc35ad02735700 (diff) | |
| download | linux-fsl-qoriq-91d75e209bd59695f0708d66964d928d45b3b2f3.tar.xz | |
Merge branch 'x86/core' into core/percpu
Diffstat (limited to 'arch/x86/configs/x86_64_defconfig')
| -rw-r--r-- | arch/x86/configs/x86_64_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 4157cc4..9fe5d21 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29-rc4 -# Thu Feb 12 12:57:29 2009 +# Tue Feb 24 15:44:16 2009 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -266,7 +266,9 @@ CONFIG_PREEMPT_VOLUNTARY=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y -# CONFIG_X86_MCE is not set +CONFIG_X86_MCE=y +CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y # CONFIG_I8K is not set CONFIG_MICROCODE=y CONFIG_MICROCODE_INTEL=y |