[kernel] r14684 - dists/trunk/linux-2.6/debian/config/kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Fri Nov 27 16:14:22 2009
New Revision: 14684

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

Modified:
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Nov 27 16:12:20 2009	(r14683)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Nov 27 16:14:22 2009	(r14684)
@@ -24,6 +24,8 @@
 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

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Nov 27 16:12:20 2009	(r14683)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Nov 27 16:14:22 2009	(r14684)
@@ -10,8 +10,6 @@
 # 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