From 5396cb0b53e2fd71cfc2a35b4b1987eff0793edb Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 4 Jan 2010 15:04:04 +0000 Subject: [PATCH] x86 set modular EDAC_DECODE_MCE svn path=/dists/trunk/linux-2.6/; revision=14887 --- debian/changelog | 3 ++- debian/config/kernelarch-x86/config | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 66cb4eedc..3a6c06b28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,8 @@ linux-2.6 (2.6.32-4) UNRELEASED; urgency=low 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 ] diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 64a092782..376f3fe00 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -324,6 +324,7 @@ CONFIG_NET_DMA=y ## 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