diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
commit | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch) | |
tree | 318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /drivers/scsi | |
parent | 955c5038823748e529a49f0e33ab635d92843500 (diff) | |
parent | 09af7b443c257460d45cb6c1896d29f173fef35b (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/dec_esp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c index 315f95a0d6c0..4f39890b44ac 100644 --- a/drivers/scsi/dec_esp.c +++ b/drivers/scsi/dec_esp.c | |||
@@ -228,7 +228,7 @@ static int dec_esp_detect(Scsi_Host_Template * tpnt) | |||
228 | mem_start = get_tc_base_addr(slot); | 228 | mem_start = get_tc_base_addr(slot); |
229 | 229 | ||
230 | /* Store base addr into esp struct */ | 230 | /* Store base addr into esp struct */ |
231 | esp->slot = PHYSADDR(mem_start); | 231 | esp->slot = CPHYSADDR(mem_start); |
232 | 232 | ||
233 | esp->dregs = 0; | 233 | esp->dregs = 0; |
234 | esp->eregs = (struct ESP_regs *) (mem_start + DEC_SCSI_SREG); | 234 | esp->eregs = (struct ESP_regs *) (mem_start + DEC_SCSI_SREG); |