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

[Maximilian Attems]

Author: maks
Date: Mon Jan  4 15:04:04 2010
New Revision: 14887

Log:
x86 set modular EDAC_DECODE_MCE

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 Jan  4 15:03:25 2010	(r14886)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jan  4 15:04:04 2010	(r14887)
@@ -21,7 +21,8 @@
     MTD_ONENAND_GENERIC, B43_SDIO, B43_PHY_LP, KEYBOARD_ADP5588, QT2160,
     KEYBOARD_LM8323, KEYBOARD_MAX7359, KEYBOARD_OPENCORES, MOUSE_PS2_SENTELIC,
     WM831X_POWER.
-  * [x86] set ACPI_POWER_METER, ACPI_PROCESSOR_AGGREGATOR, SFI.
+  * [x86] set ACPI_POWER_METER, ACPI_PROCESSOR_AGGREGATOR, SFI,
+    EDAC_DECODE_MCE.
   * Set MOUSE_PS2_ELANTECH for various EeePc. (closes: #522920)
 
   [ dann frazier ]

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon Jan  4 15:03:25 2010	(r14886)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Mon Jan  4 15:04:04 2010	(r14887)
@@ -324,6 +324,7 @@
 ##
 CONFIG_EDAC=y
 # CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_MM_EDAC=m
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set