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

[Ben Hutchings]

Author: benh
Date: Fri Aug 19 00:26:29 2011
New Revision: 17949

Log:
[x86] ACPI: Enable ACPI_APEI_MEMORY_FAILURE

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	Fri Aug 19 00:21:49 2011	(r17948)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Aug 19 00:26:29 2011	(r17949)
@@ -6,7 +6,8 @@
   * 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 <ben at decadent.org.uk>  Wed, 27 Jul 2011 23:58:10 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Aug 19 00:21:49 2011	(r17948)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Aug 19 00:26:29 2011	(r17949)
@@ -141,6 +141,7 @@
 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