From 8dcd8f9e86e5749a6af58122ab6eb131a0cd2923 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 19 Aug 2011 00:26:29 +0000 Subject: [PATCH] [x86] ACPI: Enable ACPI_APEI_MEMORY_FAILURE svn path=/dists/trunk/linux-2.6/; revision=17949 --- 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 06da25f78..2b8994ed2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,8 @@ linux-2.6 (3.1.0~rc2-1~experimental.1) UNRELEASED; urgency=low * aufs: Disable until it is updated for Linux 3.1 * rt: Disable until it is updated for Linux 3.1 * nfs: Enable NFSv4.1/pNFS (Closes: #627655) - * [x86] ACPI: Enable ACPI_APEI_GHES as built-in (no longer modular) + * [x86] ACPI: Enable ACPI_APEI_GHES as built-in (no longer modular). + Enable ACPI_APEI_MEMORY_FAILURE. -- Ben Hutchings Wed, 27 Jul 2011 23:58:10 +0200 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index bd59895dd..5711ba7a0 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -141,6 +141,7 @@ CONFIG_ACPI_HED=m CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y # CONFIG_ACPI_APEI_EINJ is not set # CONFIG_ACPI_APEI_ERST_DEBUG is not set