diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-11 13:04:39 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 13:04:39 -0400 |
| commit | 381544bba3ae6f2f1004b267da34f840b469033c (patch) | |
| tree | e748d5da19d3fa79bee2ad5b40b44722cdf64184 /drivers/scsi/libata.h | |
| parent | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (diff) | |
libata: Fix EH merge difference between this branch and upstream.
Diffstat (limited to 'drivers/scsi/libata.h')
| -rw-r--r-- | drivers/scsi/libata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index 652c08e3808e..b18d377588dc 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h | |||
| @@ -105,5 +105,6 @@ extern void ata_scsi_rbuf_fill(struct ata_scsi_args *args, | |||
| 105 | 105 | ||
| 106 | /* libata-eh.c */ | 106 | /* libata-eh.c */ |
| 107 | extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd); | 107 | extern enum scsi_eh_timer_return ata_scsi_timed_out(struct scsi_cmnd *cmd); |
| 108 | extern void ata_scsi_error(struct Scsi_Host *host); | ||
| 108 | 109 | ||
| 109 | #endif /* __LIBATA_H__ */ | 110 | #endif /* __LIBATA_H__ */ |