diff --git a/[refs] b/[refs] index 96db6abcfaf0..4b9ecc6750db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e23befe9018319dc218e2e51c20ce480e6b45eeb +refs/heads/master: 6cd727b14f1a6cdcb088d1067c1ba0ba124806a7 diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index 0b67aafd3878..220b9d7bfc28 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -530,8 +530,6 @@ extern void ata_host_set_remove(struct ata_host_set *host_set); 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 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 *);