aboutsummaryrefslogtreecommitdiff
path: root/include/scsi/scsi_transport_sas.h
diff options
context:
space:
mode:
authorGravatar James Bottomley <JBottomley@Parallels.com> 2013-05-10 07:53:40 -0700
committerGravatar James Bottomley <JBottomley@Parallels.com> 2013-05-10 07:53:40 -0700
commit832e77bc1106592c621fc42f2f6a4500e414a0a1 (patch)
tree2b226019e7b1344f05e44d79da956a5306d20780 /include/scsi/scsi_transport_sas.h
parentMerge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff)
parent[SCSI] qla2xxx: Update firmware link in Kconfig file. (diff)
downloadlinux-832e77bc1106592c621fc42f2f6a4500e414a0a1.tar.gz
linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.tar.bz2
linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.zip
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi/scsi_transport_sas.h')
-rw-r--r--include/scsi/scsi_transport_sas.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h
index 9b8e08879cfc..0bd71e2702e3 100644
--- a/include/scsi/scsi_transport_sas.h
+++ b/include/scsi/scsi_transport_sas.h
@@ -10,13 +10,6 @@ struct scsi_transport_template;
struct sas_rphy;
struct request;
-enum sas_device_type {
- SAS_PHY_UNUSED = 0,
- SAS_END_DEVICE = 1,
- SAS_EDGE_EXPANDER_DEVICE = 2,
- SAS_FANOUT_EXPANDER_DEVICE = 3,
-};
-
static inline int sas_protocol_ata(enum sas_protocol proto)
{
return ((proto & SAS_PROTOCOL_SATA) ||