diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:22:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:22:36 -0800 |
| commit | 68a696a01f482859a9fe937249e8b3d44252b610 (patch) | |
| tree | 42f2465a5f4ad008734ad45d61204d950ece7338 /drivers/scsi/blz2060.c | |
| parent | dcb92f8804717b845db70939b523c5d152a2e0ea (diff) | |
| parent | f85da084151c9454891124c999006857a354622a (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc:
[EISA] EISA registration with !CONFIG_EISA
[TC] pmagb-b-fb: Convert to the driver model
[TC] dec_esp: Driver model for the PMAZ-A
[TC] mips: pmag-ba-fb: Convert to the driver model
[TC] defxx: TURBOchannel support
[TC] TURBOchannel support for the DECstation
[TC] MIPS: TURBOchannel resources off-by-one fix
[TC] MIPS: TURBOchannel update to the driver model
Diffstat (limited to 'drivers/scsi/blz2060.c')
| -rw-r--r-- | drivers/scsi/blz2060.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/blz2060.c b/drivers/scsi/blz2060.c index b6c137b9735..b6203ec0096 100644 --- a/drivers/scsi/blz2060.c +++ b/drivers/scsi/blz2060.c @@ -100,7 +100,7 @@ int __init blz2060_esp_detect(struct scsi_host_template *tpnt) unsigned long board = z->resource.start; if (request_mem_region(board+BLZ2060_ESP_ADDR, sizeof(struct ESP_regs), "NCR53C9x")) { - esp = esp_allocate(tpnt, (void *)board+BLZ2060_ESP_ADDR); + esp = esp_allocate(tpnt, (void *)board + BLZ2060_ESP_ADDR, 0); /* Do command transfer with programmed I/O */ esp->do_pio_cmds = 1; |