diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/scsi/scsi_priv.h | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/scsi_priv.h')
| -rw-r--r-- | drivers/scsi/scsi_priv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h index d30d7f4e63ec..ee6de1768e53 100644 --- a/drivers/scsi/scsi_priv.h +++ b/drivers/scsi/scsi_priv.h | |||
| @@ -63,6 +63,9 @@ extern int __init scsi_init_devinfo(void); | |||
| 63 | extern void scsi_exit_devinfo(void); | 63 | extern void scsi_exit_devinfo(void); |
| 64 | 64 | ||
| 65 | /* scsi_error.c */ | 65 | /* scsi_error.c */ |
| 66 | extern void scsi_add_timer(struct scsi_cmnd *, int, | ||
| 67 | void (*)(struct scsi_cmnd *)); | ||
| 68 | extern int scsi_delete_timer(struct scsi_cmnd *); | ||
| 66 | extern void scsi_times_out(struct scsi_cmnd *cmd); | 69 | extern void scsi_times_out(struct scsi_cmnd *cmd); |
| 67 | extern int scsi_error_handler(void *host); | 70 | extern int scsi_error_handler(void *host); |
| 68 | extern int scsi_decide_disposition(struct scsi_cmnd *cmd); | 71 | extern int scsi_decide_disposition(struct scsi_cmnd *cmd); |