diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 15:23:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-27 15:23:47 -0400 |
| commit | e00b95debb9a0f023b61abcd4b1e74f687276b47 (patch) | |
| tree | 4e47c804655d9ce01ea88b0eaafd68dcfeb3b79a /drivers | |
| parent | b68f2fb9e73f46037fbeca5fbd4ae8a7ddd8ef6b (diff) | |
| parent | 4afcd2dcc6d89da696fc9d469a909adafa9d3636 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/amd64_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 858fe6037223..24964c1d0af9 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) | |||
| 970 | } | 970 | } |
| 971 | 971 | ||
| 972 | for (cs = 0; cs < pvt->num_dcsm; cs++) { | 972 | for (cs = 0; cs < pvt->num_dcsm; cs++) { |
| 973 | reg = K8_DCSB0 + (cs * 4); | 973 | reg = K8_DCSM0 + (cs * 4); |
| 974 | err = pci_read_config_dword(pvt->dram_f2_ctl, reg, | 974 | err = pci_read_config_dword(pvt->dram_f2_ctl, reg, |
| 975 | &pvt->dcsm0[cs]); | 975 | &pvt->dcsm0[cs]); |
| 976 | if (unlikely(err)) | 976 | if (unlikely(err)) |