From 381544bba3ae6f2f1004b267da34f840b469033c Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 11 Apr 2006 13:04:39 -0400
Subject: libata: Fix EH merge difference between this branch and upstream.

---
 include/linux/libata.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'include/linux/libata.h')

diff --git a/include/linux/libata.h b/include/linux/libata.h
index a7161d42d18..2564bc514bc 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);
-- 
cgit v1.2.3