[PATCH] libata: add host_set->next for legacy two host_sets case, take #3

[linux-2.6] / include / scsi / scsi_transport_sas.h

diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index 2943ccc22a439162bb107d4e90114f5ff537e2ca..93cfb4bf4211231ba82f92e492b788d65a366c03 100644 (file)
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -82,10 +82,6 @@ struct sas_rphy {
        struct sas_identify     identify;
        struct list_head        list;
        u32                     scsi_target_id;
-       /* temporary expedient: mark the rphy as being contained
-        * within a type specific rphy
-        * FIXME: pull this out when everything uses the containers */
-       unsigned                contained:1;
 };
 
 #define dev_to_rphy(d) \
@@ -145,7 +141,6 @@ extern int sas_phy_add(struct sas_phy *);
 extern void sas_phy_delete(struct sas_phy *);
 extern int scsi_is_sas_phy(const struct device *);
 
-extern struct sas_rphy *sas_rphy_alloc(struct sas_phy *);
 extern struct sas_rphy *sas_end_device_alloc(struct sas_phy *);
 extern struct sas_rphy *sas_expander_alloc(struct sas_phy *, enum sas_device_type);
 void sas_rphy_free(struct sas_rphy *);