commit e00b95debb9a0f023b61abcd4b1e74f687276b47
author Linus Torvalds <torvalds@linux-foundation.org> Mon Jul 27 12:23:47 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Jul 27 12:23:47 2009 -0700
tree 4e47c804655d9ce01ea88b0eaafd68dcfeb3b79a
parent b68f2fb9e73f46037fbeca5fbd4ae8a7ddd8ef6b
parent 4afcd2dcc6d89da696fc9d469a909adafa9d3636

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac: read the right F2 maskoffset reg

drivers/edac/amd64_edac.c

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 858fe60..24964c1 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -970,7 +970,7 @@
 	}
 
 	for (cs = 0; cs < pvt->num_dcsm; cs++) {
-		reg = K8_DCSB0 + (cs * 4);
+		reg = K8_DCSM0 + (cs * 4);
 		err = pci_read_config_dword(pvt->dram_f2_ctl, reg,
 					&pvt->dcsm0[cs]);
 		if (unlikely(err))