diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-09-06 18:52:54 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-09-06 18:52:54 -0400 |
| commit | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (patch) | |
| tree | 8cf55e47ce681a6c899ccf8e06abeccecb20d38b /include/scsi/scsi_eh.h | |
| parent | 3173d8c342971a03857d8af749a3f57da7d06b57 (diff) | |
| parent | fe1b2d544d71300f8e2d151c3c77a130d13a58be (diff) | |
Merge by hand (conflicts in sd.c)
Diffstat (limited to 'include/scsi/scsi_eh.h')
| -rw-r--r-- | include/scsi/scsi_eh.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h index b24d224281bd..fabd879c2f2e 100644 --- a/include/scsi/scsi_eh.h +++ b/include/scsi/scsi_eh.h | |||
| @@ -35,9 +35,6 @@ static inline int scsi_sense_valid(struct scsi_sense_hdr *sshdr) | |||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | extern void scsi_add_timer(struct scsi_cmnd *, int, | ||
| 39 | void (*)(struct scsi_cmnd *)); | ||
| 40 | extern int scsi_delete_timer(struct scsi_cmnd *); | ||
| 41 | extern void scsi_report_bus_reset(struct Scsi_Host *, int); | 38 | extern void scsi_report_bus_reset(struct Scsi_Host *, int); |
| 42 | extern void scsi_report_device_reset(struct Scsi_Host *, int, int); | 39 | extern void scsi_report_device_reset(struct Scsi_Host *, int, int); |
| 43 | extern int scsi_block_when_processing_errors(struct scsi_device *); | 40 | extern int scsi_block_when_processing_errors(struct scsi_device *); |