[kernel] r14414 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Mon Oct 19 22:14:01 2009
New Revision: 14414

Log:
[x86] Enable modular X86_MCE_INJECT

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Oct 19 19:12:32 2009	(r14413)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Oct 19 22:14:01 2009	(r14414)
@@ -12,7 +12,7 @@
 
   [ maximilian attems ]
   * [alpha] Disable SND_MIXART, causes gcc ICE.
-
+  * [x86] Enable modular X86_MCE_INJECT.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Oct 2009 02:18:40 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon Oct 19 19:12:32 2009	(r14413)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon Oct 19 22:14:01 2009	(r14414)
@@ -24,7 +24,7 @@
 CONFIG_SCHED_MC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
-# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_MCE_INJECT=m
 CONFIG_I8K=m
 CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y