diff options
author | James Bottomley <jejb@mulgrave.(none)> | 2005-05-26 14:14:55 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-26 14:14:55 -0400 |
commit | 153b1e1fd957861e2c185473dd3c3d93561066e4 (patch) | |
tree | c296359e8212ed83c2834b20a62b7a650f3d0fc2 /drivers/scsi/dpti.h | |
parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
parent | c3e9dda4f5702ee5b346f4770de53f79e8ad1d8d (diff) |
Automatic merge of ../scsi-misc-2.6-old/
Diffstat (limited to 'drivers/scsi/dpti.h')
-rw-r--r-- | drivers/scsi/dpti.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h index 426e15dd490..9821783c016 100644 --- a/drivers/scsi/dpti.h +++ b/drivers/scsi/dpti.h @@ -296,7 +296,7 @@ static s32 adpt_i2o_status_get(adpt_hba* pHba); static s32 adpt_i2o_init_outbound_q(adpt_hba* pHba); static s32 adpt_i2o_hrt_get(adpt_hba* pHba); static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_device* dptdevice); -static s32 adpt_i2o_to_scsi(ulong reply, struct scsi_cmnd* cmd); +static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd); static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht); static s32 adpt_hba_reset(adpt_hba* pHba); static s32 adpt_i2o_reset_hba(adpt_hba* pHba); |