aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/configs/x86_64_defconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/configs/x86_64_defconfig')
-rw-r--r--arch/x86/configs/x86_64_defconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
index 4157cc4a2bde..9fe5d212ab4c 100644
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.29-rc4 3# Linux kernel version: 2.6.29-rc4
4# Thu Feb 12 12:57:29 2009 4# Tue Feb 24 15:44:16 2009
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7# CONFIG_X86_32 is not set 7# CONFIG_X86_32 is not set
@@ -266,7 +266,9 @@ CONFIG_PREEMPT_VOLUNTARY=y
266CONFIG_X86_LOCAL_APIC=y 266CONFIG_X86_LOCAL_APIC=y
267CONFIG_X86_IO_APIC=y 267CONFIG_X86_IO_APIC=y
268CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y 268CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
269# CONFIG_X86_MCE is not set 269CONFIG_X86_MCE=y
270CONFIG_X86_MCE_INTEL=y
271CONFIG_X86_MCE_AMD=y
270# CONFIG_I8K is not set 272# CONFIG_I8K is not set
271CONFIG_MICROCODE=y 273CONFIG_MICROCODE=y
272CONFIG_MICROCODE_INTEL=y 274CONFIG_MICROCODE_INTEL=y