summaryrefslogtreecommitdiffstats
path: root/drivers/edac/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-24 13:06:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-24 13:06:57 -0700
commit8de547e1824437f3c6af180d3ed2162fa4b3f389 (patch)
tree1318eea19b4b6a563ea2bbe95cf9b2ad10f92b43 /drivers/edac/Makefile
parent76c39e4fef73e42777c27d6b87a04f89ebd0ef66 (diff)
parente6649cc62949f1ed473bf1131fa425cfe72d3f64 (diff)
downloadop-kernel-dev-8de547e1824437f3c6af180d3ed2162fa4b3f389.zip
op-kernel-dev-8de547e1824437f3c6af180d3ed2162fa4b3f389.tar.gz
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/Makefile')
-rw-r--r--drivers/edac/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index 32c7bc9..b378139 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_EDAC_CPC925) += cpc925_edac.o
obj-$(CONFIG_EDAC_I5000) += i5000_edac.o
obj-$(CONFIG_EDAC_I5100) += i5100_edac.o
obj-$(CONFIG_EDAC_I5400) += i5400_edac.o
+obj-$(CONFIG_EDAC_I7300) += i7300_edac.o
obj-$(CONFIG_EDAC_I7CORE) += i7core_edac.o
obj-$(CONFIG_EDAC_E7XXX) += e7xxx_edac.o
obj-$(CONFIG_EDAC_E752X) += e752x_edac.o
OpenPOWER on IntegriCloud