diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
| commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
| tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /drivers/s390/scsi/zfcp_ext.h | |
| parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
| parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) | |
Merge ../powerpc-merge
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 *); | |||
| 194 | extern void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *); | 194 | extern void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *); |
| 195 | 195 | ||
| 196 | extern void zfcp_scsi_dbf_event_result(const char *, int, struct zfcp_adapter *, | 196 | extern void zfcp_scsi_dbf_event_result(const char *, int, struct zfcp_adapter *, |
| 197 | struct scsi_cmnd *); | 197 | struct scsi_cmnd *, |
| 198 | struct zfcp_fsf_req *); | ||
| 198 | extern void zfcp_scsi_dbf_event_abort(const char *, struct zfcp_adapter *, | 199 | extern void zfcp_scsi_dbf_event_abort(const char *, struct zfcp_adapter *, |
| 199 | struct scsi_cmnd *, | 200 | struct scsi_cmnd *, struct zfcp_fsf_req *, |
| 200 | struct zfcp_fsf_req *); | 201 | struct zfcp_fsf_req *); |
| 201 | extern void zfcp_scsi_dbf_event_devreset(const char *, u8, struct zfcp_unit *, | 202 | extern void zfcp_scsi_dbf_event_devreset(const char *, u8, struct zfcp_unit *, |
| 202 | struct scsi_cmnd *); | 203 | struct scsi_cmnd *); |