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

[Ben Hutchings]

Author: benh
Date: Sat Dec  4 19:01:56 2010
New Revision: 16625

Log:
Explicitly disable new options IRQ_TIME_ACCOUNTING and X86_ANCIENT_MCE

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

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Dec  4 18:45:17 2010	(r16624)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Dec  4 19:01:56 2010	(r16625)
@@ -24,10 +24,12 @@
 CONFIG_HPET_TIMER=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
 CONFIG_X86_MCE_INJECT=m
 CONFIG_I8K=m
 CONFIG_MICROCODE=m