---

yaml --- r: 83820 b: refs/heads/master c: 4f4aeea h: refs/heads/master v: v3
git-mirror · Feb 7, 2008 · b979fd3 · b979fd3
1 parent 8dd6a87
commit b979fd3
Show file tree

Hide file tree

Showing 5 changed files with 978 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9a753d53204bf0f42841f65679c7e1711833bcf
+refs/heads/master: 4f4aeeabc061826376c9a72b4714d062664999ea
diff --git a/trunk/drivers/edac/Kconfig b/trunk/drivers/edac/Kconfig
@@ -130,6 +130,13 @@ config EDAC_MPC85XX
 	  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

diff --git a/trunk/drivers/edac/Makefile b/trunk/drivers/edac/Makefile
@@ -29,5 +29,6 @@ obj-$(CONFIG_EDAC_I82860)		+= i82860_edac.o
 obj-$(CONFIG_EDAC_R82600)		+= r82600_edac.o
 obj-$(CONFIG_EDAC_PASEMI)		+= pasemi_edac.o
 obj-$(CONFIG_EDAC_MPC85XX)		+= mpc85xx_edac.o
+obj-$(CONFIG_EDAC_MV64X60)		+= mv64x60_edac.o
 obj-$(CONFIG_EDAC_CELL)			+= cell_edac.o