Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[~andy/linux] / drivers / edac / Kconfig

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index ab4f3592a11c58bcf48137afa6fedb5030cca8d3..4339b1a879cdb3ea1c6c3f5a570902c9769ac464 100644 (file)
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -5,7 +5,7 @@
 #
 
 menuconfig EDAC
-       bool "EDAC - error detection and reporting"
+       bool "EDAC (Error Detection And Correction) reporting"
        depends on HAS_IOMEM
        depends on X86 || PPC
        help
@@ -232,4 +232,13 @@ config EDAC_AMD8111
          Note, add more Kconfig dependency if it's adopted
          on some machine other than Maple.
 
+config EDAC_CPC925
+       tristate "IBM CPC925 Memory Controller (PPC970FX)"
+       depends on EDAC_MM_EDAC && PPC64
+       help
+         Support for error detection and correction on the
+         IBM CPC925 Bridge and Memory Controller, which is
+         a companion chip to the PowerPC 970 family of
+         processors.
+
 endif # EDAC