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

[Maximilian Attems]

Author: maks
Date: Sat Jul 18 16:00:31 2009
New Revision: 13970

Log:
x86 enable EDAC_AMD64

centralize the x86 edac settings as bonus.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/i386/config
   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	Sat Jul 18 15:55:56 2009	(r13969)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Jul 18 16:00:31 2009	(r13970)
@@ -19,7 +19,7 @@
   * 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 ]

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Sat Jul 18 15:55:56 2009	(r13969)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Sat Jul 18 16:00:31 2009	(r13970)
@@ -162,23 +162,6 @@
 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
 ##
 CONFIG_EDD=m

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Sat Jul 18 15:55:56 2009	(r13969)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Sat Jul 18 16:00:31 2009	(r13970)
@@ -185,23 +185,6 @@
 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
 ##
 CONFIG_EDD=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Jul 18 15:55:56 2009	(r13969)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Jul 18 16:00:31 2009	(r13970)
@@ -163,6 +163,24 @@
 ## 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
 ##
 CONFIG_XEN_KBDDEV_FRONTEND=y