diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:37:58 -0400 |
| commit | 5a2cec83a9bb1b4295aa8ab728fcb8ca1811a33c (patch) | |
| tree | 2f83dc6949763e77cf6422e696dc6146684dcf4e /drivers/scsi/scsi_priv.h | |
| parent | f2c853bca542f5ac0b036377637192a74f2091c2 (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); |