Merge branch 'tmp'

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 5915f763b722..88f0a27cc7c3 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -401,6 +401,7 @@ struct ata_port {
         unsigned long           pio_task_timeout;
 
         u32                     msg_enable;
+        struct list_head        eh_done_q;
 
         void                    *private_data;
 };
@@ -493,6 +494,8 @@ extern int ata_scsi_detect(struct scsi_host_template *sht);
 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
 extern int ata_scsi_error(struct Scsi_Host *host);
+extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);
+extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
 extern int ata_scsi_release(struct Scsi_Host *host);
 extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
 extern int ata_scsi_device_resume(struct scsi_device *);