diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-11 19:04:39 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 19:04:39 +0200 |
commit | 381544bba3ae6f2f1004b267da34f840b469033c (patch) | |
tree | e748d5da19d3fa79bee2ad5b40b44722cdf64184 /include | |
parent | Merge branch 'master' (diff) | |
download | linux-381544bba3ae6f2f1004b267da34f840b469033c.tar.xz linux-381544bba3ae6f2f1004b267da34f840b469033c.zip |
libata: Fix EH merge difference between this branch and upstream.
Diffstat (limited to 'include')
-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_ /* * EH */ -extern int ata_scsi_error(struct Scsi_Host *host); extern void ata_eng_timeout(struct ata_port *ap); extern void ata_eh_qc_complete(struct ata_queued_cmd *qc); extern void ata_eh_qc_retry(struct ata_queued_cmd *qc); |