diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-16 12:47:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-16 12:47:44 -0800 |
| commit | 26d451b603e754ded83f0e5becab2a78253ad100 (patch) | |
| tree | 99209544823dbdb5735ae5f7234c83beea2f6a22 /drivers/s390/scsi/zfcp_ext.h | |
| parent | 90f9dd8f72773152b69042debd6b9ed6d224703a (diff) | |
| parent | 65110b2168950a19cc78b5027ed18cb811fbdae8 (diff) | |
| download | blackbird-op-linux-26d451b603e754ded83f0e5becab2a78253ad100.tar.gz blackbird-op-linux-26d451b603e754ded83f0e5becab2a78253ad100.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/s390/scsi/zfcp_ext.h')
| -rw-r--r-- | drivers/s390/scsi/zfcp_ext.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index c1ba7cf1b496..700f5402a978 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h @@ -194,9 +194,10 @@ extern void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *); extern void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *); extern void zfcp_scsi_dbf_event_result(const char *, int, struct zfcp_adapter *, - struct scsi_cmnd *); + struct scsi_cmnd *, + struct zfcp_fsf_req *); extern void zfcp_scsi_dbf_event_abort(const char *, struct zfcp_adapter *, - struct scsi_cmnd *, + struct scsi_cmnd *, struct zfcp_fsf_req *, struct zfcp_fsf_req *); extern void zfcp_scsi_dbf_event_devreset(const char *, u8, struct zfcp_unit *, struct scsi_cmnd *); |
