Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23

[linux-2.6-block.git] / drivers / edac / Kconfig

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 57a7384858dae540e23f90e1af4208c3203ade36..98b6b4fb42577615447648d0cdbb3a3a7a33ca98 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,6 +88,13 @@ 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
@@ -116,4 +123,13 @@ config EDAC_I5000
          Support for error detection and correction the Intel
          Greekcreek/Blackford chipsets.
 
+config EDAC_PASEMI
+       tristate "PA Semi PWRficient"
+       depends on EDAC_MM_EDAC && PCI
+       depends on PPC_PASEMI
+       help
+         Support for error detection and correction on PA Semi
+         PWRficient.
+
+
 endif # EDAC