* debian/config/kernelarch-x86/config:

Explicitely set X86_MCE_INTEL and X86_MCE_AMD.
* debian/config/kernelarch-x86/config-arch-64: Remove duplicated options.

svn path=/dists/trunk/linux-2.6/; revision=14684
This commit is contained in:
Bastian Blank 2009-11-27 16:14:22 +00:00
parent b5e831d211
commit c7da8db431
2 changed files with 2 additions and 2 deletions

View File

@ -24,6 +24,8 @@ CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_AMD=y
CONFIG_X86_MCE_INJECT=m
CONFIG_I8K=m
CONFIG_MICROCODE=m

View File

@ -10,8 +10,6 @@ CONFIG_AMD_IOMMU=y
# CONFIG_AMD_IOMMU_STATS is not set
# CONFIG_MAXSMP is not set
CONFIG_NR_CPUS=512
CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_AMD=y
CONFIG_NUMA=y
CONFIG_K8_NUMA=y
CONFIG_X86_64_ACPI_NUMA=y