summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-27 19:23:47 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-27 19:23:47 (GMT)
commite00b95debb9a0f023b61abcd4b1e74f687276b47 (patch)
tree4e47c804655d9ce01ea88b0eaafd68dcfeb3b79a
parentb68f2fb9e73f46037fbeca5fbd4ae8a7ddd8ef6b (diff)
parent4afcd2dcc6d89da696fc9d469a909adafa9d3636 (diff)
downloadlinux-e00b95debb9a0f023b61abcd4b1e74f687276b47.tar.xz
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
-rw-r--r--drivers/edac/amd64_edac.c2
1 files changed, 1 insertions, 1 deletions
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 @@ static void amd64_read_dct_base_mask(struct amd64_pvt *pvt)
}
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))