From d22061fc5a806cfac7fc3d2aca6b37c39a860dec Mon Sep 17 00:00:00 2001
From: Maximilian Attems <maks@debian.org>
Date: Sat, 18 Jul 2009 16:00:31 +0000
Subject: [PATCH] x86 enable EDAC_AMD64

centralize the x86 edac settings as bonus.

svn path=/dists/trunk/linux-2.6/; revision=13970
---
 debian/changelog                    |  2 +-
 debian/config/amd64/config          | 17 -----------------
 debian/config/i386/config           | 17 -----------------
 debian/config/kernelarch-x86/config | 18 ++++++++++++++++++
 4 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 376bab464..ae9048cd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,7 @@ linux-2.6 (2.6.31~rc3-1~experimental.1) UNRELEASED; urgency=low
   * Disable v4l1 ov511 and quickcam_messenger drivers.
   * [x86_64] Enable HW_RANDOM_VIA.
   * [x86] Keep divers staging stuff enabled.
-  * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS, ACERHDF.
+  * [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS, ACERHDF, EDAC_AMD64.
   * rtl8192su: remove firmware and disable.
 
   [ Ben Hutchings ]
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 958fa64d8..13bf6eb41 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -161,23 +161,6 @@ CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m
 CONFIG_NET_DMA=y
 
-##
-## file: drivers/edac/Kconfig
-##
-CONFIG_EDAC=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD76X=m
-CONFIG_EDAC_E7XXX=m
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82875P=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I82860=m
-CONFIG_EDAC_R82600=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_AMD8131=m
-CONFIG_EDAC_AMD8111=m
-
 ##
 ## file: drivers/firmware/Kconfig
 ##
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 38e25d994..1b96b34db 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -184,23 +184,6 @@ CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m
 CONFIG_NET_DMA=y
 
-##
-## file: drivers/edac/Kconfig
-##
-CONFIG_EDAC=y
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD76X=m
-CONFIG_EDAC_E7XXX=m
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82875P=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I82860=m
-CONFIG_EDAC_R82600=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_AMD8131=m
-CONFIG_EDAC_AMD8111=m
-
 ##
 ## file: drivers/firmware/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 65c5fba21..7ecc602e6 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -162,6 +162,24 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 ## end choice
 
+##
+## file: drivers/edac/Kconfig
+##
+CONFIG_EDAC=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_AMD64=m
+CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I82860=m
+CONFIG_EDAC_R82600=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_AMD8131=m
+CONFIG_EDAC_AMD8111=m
+
 ##
 ## file: drivers/input/Kconfig
 ##