diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 13:06:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 13:06:57 -0700 |
commit | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (patch) | |
tree | 1318eea19b4b6a563ea2bbe95cf9b2ad10f92b43 /drivers/edac/Kconfig | |
parent | 76c39e4fef73e42777c27d6b87a04f89ebd0ef66 (diff) | |
parent | e6649cc62949f1ed473bf1131fa425cfe72d3f64 (diff) | |
download | linux-stable-8de547e1824437f3c6af180d3ed2162fa4b3f389.tar.gz linux-stable-8de547e1824437f3c6af180d3ed2162fa4b3f389.tar.bz2 linux-stable-8de547e1824437f3c6af180d3ed2162fa4b3f389.zip |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac
* 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac: (25 commits)
i7300_edac: Properly initialize per-csrow memory size
V4L/DVB: i7300_edac: better initialize page counts
MAINTAINERS: Add maintainer for i7300-edac driver
i7300-edac: CodingStyle cleanup
i7300_edac: Improve comments
i7300_edac: Cleanup: reorganize the file contents
i7300_edac: Properly detect channel on CE errors
i7300_edac: enrich FBD error info for corrected errors
i7300_edac: enrich FBD error info for fatal errors
i7300_edac: pre-allocate a buffer used to prepare err messages
i7300_edac: Fix MTR x4/x8 detection logic
i7300_edac: Make the debug messages coherent with the others
i7300_edac: Cleanup: remove get_error_info logic
i7300_edac: Add a code to cleanup error registers
i7300_edac: Add support for reporting FBD errors
i7300_edac: Properly detect the type of error correction
i7300_edac: Detect if the device is on single mode
i7300_edac: Adds detection for enhanced scrub mode on x8
i7300_edac: Clear the error bit after reading
i7300_edac: Add error detection code for global errors
...
Diffstat (limited to 'drivers/edac/Kconfig')
-rw-r--r-- | drivers/edac/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 9dbb28b9559f..f436a2fa9f38 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -209,6 +209,13 @@ config EDAC_I5100 Support for error detection and correction the Intel San Clemente MCH. +config EDAC_I7300 + tristate "Intel Clarksboro MCH" + depends on EDAC_MM_EDAC && X86 && PCI + help + Support for error detection and correction the Intel + Clarksboro MCH (Intel 7300 chipset). + config EDAC_MPC85XX tristate "Freescale MPC83xx / MPC85xx" depends on EDAC_MM_EDAC && FSL_SOC && (PPC_83xx || PPC_85xx) |