diff options
| author | Maximilian Attems <maks@debian.org> | 2010-01-04 15:04:04 +0000 |
|---|---|---|
| committer | Maximilian Attems <maks@debian.org> | 2010-01-04 15:04:04 +0000 |
| commit | 5396cb0b53e2fd71cfc2a35b4b1987eff0793edb (patch) | |
| tree | 95445ceb328dff229a94887d93dc25a817ffcaa5 | |
| parent | d0e363924872e5203be8f0a680cb2b392eb7a4f2 (diff) | |
| download | kernel_replicant_linux-5396cb0b53e2fd71cfc2a35b4b1987eff0793edb.tar.gz kernel_replicant_linux-5396cb0b53e2fd71cfc2a35b4b1987eff0793edb.tar.bz2 kernel_replicant_linux-5396cb0b53e2fd71cfc2a35b4b1987eff0793edb.zip | |
x86 set modular EDAC_DECODE_MCE
svn path=/dists/trunk/linux-2.6/; revision=14887
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/config/kernelarch-x86/config | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 66cb4eedcd67..3a6c06b282a9 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 64a0927829ba..376f3fe0010e 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 |