Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / include / scsi / sas_ata.h

diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h
index 77670e823ed8e7926c617c6a736f6c427f3b437e..2dfbdaa0b34a8b64cf94e22ec2a5f21bdc0990a9 100644 (file)
--- a/include/scsi/sas_ata.h
+++ b/include/scsi/sas_ata.h
@@ -45,6 +45,7 @@ void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
 void sas_ata_schedule_reset(struct domain_device *dev);
 void sas_ata_wait_eh(struct domain_device *dev);
 void sas_probe_sata(struct asd_sas_port *port);
+void sas_ata_end_eh(struct ata_port *ap);
 #else
 
 
@@ -85,6 +86,10 @@ static inline int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy
 {
        return 0;
 }
+
+static inline void sas_ata_end_eh(struct ata_port *ap)
+{
+}
 #endif
 
 #endif /* _SAS_ATA_H_ */