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 /include/linux/libata.h | |
| parent | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (diff) | |
libata: Fix EH merge difference between this branch and upstream.
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index a7161d42d18f..2564bc514bca 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
| @@ -637,7 +637,6 @@ extern unsigned long ata_pci_default_filter(const struct ata_port *, struct ata_ | |||
| 637 | /* | 637 | /* |
| 638 | * EH | 638 | * EH |
| 639 | */ | 639 | */ |
| 640 | extern int ata_scsi_error(struct Scsi_Host *host); | ||
| 641 | extern void ata_eng_timeout(struct ata_port *ap); | 640 | extern void ata_eng_timeout(struct ata_port *ap); |
| 642 | extern void ata_eh_qc_complete(struct ata_queued_cmd *qc); | 641 | extern void ata_eh_qc_complete(struct ata_queued_cmd *qc); |
| 643 | extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); | 642 | extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); |