Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6-omap-h63xx.git] / drivers / edac / Kconfig

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 43570d41f27c83aac34469355bbfb55f81fee0e4..2b382990fe58772238eabd8e29b2485b95981778 100644 (file)
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -8,7 +8,7 @@ menuconfig EDAC
        bool "EDAC - error detection and reporting (EXPERIMENTAL)"
        depends on HAS_IOMEM
        depends on EXPERIMENTAL
-       depends on X86 || MIPS || PPC
+       depends on X86 || PPC
        help
          EDAC is designed to report errors in the core system.
          These are low-level errors that are reported in the CPU or
@@ -88,9 +88,16 @@ config EDAC_I82875P
          Support for error detection and correction on the Intel
          DP82785P and E7210 server chipsets.
 
+config EDAC_I82975X
+       tristate "Intel 82975x (D82975x)"
+       depends on EDAC_MM_EDAC && PCI && X86
+       help
+         Support for error detection and correction on the Intel
+         DP82975x server chipsets.
+
 config EDAC_I3000
        tristate "Intel 3000/3010"
-       depends on EDAC_MM_EDAC && PCI && X86_32
+       depends on EDAC_MM_EDAC && PCI && X86
        help
          Support for error detection and correction on the Intel
          3000 and 3010 server chipsets.
@@ -116,13 +123,34 @@ config EDAC_I5000
          Support for error detection and correction the Intel
          Greekcreek/Blackford chipsets.
 
+config EDAC_MPC85XX
+       tristate "Freescale MPC85xx"
+       depends on EDAC_MM_EDAC && FSL_SOC && MPC85xx
+       help
+         Support for error detection and correction on the Freescale
+         MPC8560, MPC8540, MPC8548
+
+config EDAC_MV64X60
+       tristate "Marvell MV64x60"
+       depends on EDAC_MM_EDAC && MV64X60
+       help
+         Support for error detection and correction on the Marvell
+         MV64360 and MV64460 chipsets.
+
 config EDAC_PASEMI
        tristate "PA Semi PWRficient"
        depends on EDAC_MM_EDAC && PCI
-       depends on PPC
+       depends on PPC_PASEMI
        help
          Support for error detection and correction on PA Semi
          PWRficient.
 
+config EDAC_CELL
+       tristate "Cell Broadband Engine memory controller"
+       depends on EDAC_MM_EDAC && PPC_CELL_NATIVE
+       help
+         Support for error detection and correction on the
+         Cell Broadband Engine internal memory controller
+         on platform without a hypervisor
 
 endif # EDAC