Merge tag 'vfio-v4.6-rc1' of git://github.com/awilliam/linux-vfio

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

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index ef25000a5bc69845aa5234a451f80d27f259eb01..37755e63cc289fccc2746ec127193baa854f2dc0 100644 (file)
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -367,14 +367,30 @@ config EDAC_OCTEON_PCI
          Support for error detection and correction on the
          Cavium Octeon family of SOCs.
 
-config EDAC_ALTERA_MC
-       bool "Altera SDRAM Memory Controller EDAC"
+config EDAC_ALTERA
+       bool "Altera SOCFPGA ECC"
        depends on EDAC_MM_EDAC=y && ARCH_SOCFPGA
        help
          Support for error detection and correction on the
-         Altera SDRAM memory controller. Note that the
-         preloader must initialize the SDRAM before loading
-         the kernel.
+         Altera SOCs. This must be selected for SDRAM ECC.
+         Note that the preloader must initialize the SDRAM
+         before loading the kernel.
+
+config EDAC_ALTERA_L2C
+       bool "Altera L2 Cache ECC"
+       depends on EDAC_ALTERA=y
+       select CACHE_L2X0
+       help
+         Support for error detection and correction on the
+         Altera L2 cache Memory for Altera SoCs. This option
+         requires L2 cache so it will force that selection.
+
+config EDAC_ALTERA_OCRAM
+       bool "Altera On-Chip RAM ECC"
+       depends on EDAC_ALTERA=y && SRAM && GENERIC_ALLOCATOR
+       help
+         Support for error detection and correction on the
+         Altera On-Chip RAM Memory for Altera SoCs.
 
 config EDAC_SYNOPSYS
        tristate "Synopsys DDR Memory Controller"