Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / include / scsi / sas_ata.h

diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h
index 3407c819522de3fffa739a82f41c2ab04098a685..c583193ae929333a440ff7ae69efb74082a974dc 100644 (file)
--- a/include/scsi/sas_ata.h
+++ b/include/scsi/sas_ata.h
@@ -28,6 +28,8 @@
 #include <linux/libata.h>
 #include <scsi/libsas.h>
 
+#ifdef CONFIG_SCSI_SAS_ATA
+
 static inline int dev_is_sata(struct domain_device *dev)
 {
        return (dev->rphy->identify.target_port_protocols & SAS_PROTOCOL_SATA);
@@ -38,4 +40,21 @@ int sas_ata_init_host_and_port(struct domain_device *found_dev,
 
 void sas_ata_task_abort(struct sas_task *task);
 
+#else
+
+
+static inline int dev_is_sata(struct domain_device *dev)
+{
+       return 0;
+}
+static inline int sas_ata_init_host_and_port(struct domain_device *found_dev,
+                              struct scsi_target *starget)
+{
+       return 0;
+}
+static inline void sas_ata_task_abort(struct sas_task *task)
+{
+}
+#endif
+
 #endif /* _SAS_ATA_H_ */