diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 18:42:23 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 18:42:23 -0500 |
| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/dpti.h | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
| download | kernel_samsung_smdk4412-3237ee78fc00f786d5f5aec6f9310b0e39069f15.tar.gz kernel_samsung_smdk4412-3237ee78fc00f786d5f5aec6f9310b0e39069f15.tar.bz2 kernel_samsung_smdk4412-3237ee78fc00f786d5f5aec6f9310b0e39069f15.zip | |
merge by hand (fix up qla_os.c merge error)
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); |