diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:19:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:19:08 -0500 |
commit | 9b73e76f3cf63379dcf45fcd4f112f5812418d0a (patch) | |
tree | 4e6bef87cd0cd6d848fc39a5ae25b981dbbe035b /include/scsi/scsi_transport_sas.h | |
parent | 50d9a126240f9961cfdd063336bbeb91f77a7dce (diff) | |
parent | 23c3e290fb9ce38cabc2822b47583fc8702411bf (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
[SCSI] usbstorage: use last_sector_bug flag universally
[SCSI] libsas: abstract STP task status into a function
[SCSI] ultrastor: clean up inline asm warnings
[SCSI] aic7xxx: fix firmware build
[SCSI] aacraid: fib context lock for management ioctls
[SCSI] ch: remove forward declarations
[SCSI] ch: fix device minor number management bug
[SCSI] ch: handle class_device_create failure properly
[SCSI] NCR5380: fix section mismatch
[SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
[SCSI] IB/iSER: add logical unit reset support
[SCSI] don't use __GFP_DMA for sense buffers if not required
[SCSI] use dynamically allocated sense buffer
[SCSI] scsi.h: add macro for enclosure bit of inquiry data
[SCSI] sd: add fix for devices with last sector access problems
[SCSI] fix pcmcia compile problem
[SCSI] aacraid: add Voodoo Lite class of cards.
[SCSI] aacraid: add new driver features flags
[SCSI] qla2xxx: Update version number to 8.02.00-k7.
[SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
...
Diffstat (limited to 'include/scsi/scsi_transport_sas.h')
-rw-r--r-- | include/scsi/scsi_transport_sas.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/include/scsi/scsi_transport_sas.h b/include/scsi/scsi_transport_sas.h index abdfd2e27dd7..09125fa95b93 100644 --- a/include/scsi/scsi_transport_sas.h +++ b/include/scsi/scsi_transport_sas.h | |||
@@ -4,23 +4,17 @@ | |||
4 | #include <linux/transport_class.h> | 4 | #include <linux/transport_class.h> |
5 | #include <linux/types.h> | 5 | #include <linux/types.h> |
6 | #include <linux/mutex.h> | 6 | #include <linux/mutex.h> |
7 | #include <scsi/sas.h> | ||
7 | 8 | ||
8 | struct scsi_transport_template; | 9 | struct scsi_transport_template; |
9 | struct sas_rphy; | 10 | struct sas_rphy; |
10 | struct request; | 11 | struct request; |
11 | 12 | ||
12 | enum sas_device_type { | 13 | enum sas_device_type { |
13 | SAS_PHY_UNUSED, | 14 | SAS_PHY_UNUSED = 0, |
14 | SAS_END_DEVICE, | 15 | SAS_END_DEVICE = 1, |
15 | SAS_EDGE_EXPANDER_DEVICE, | 16 | SAS_EDGE_EXPANDER_DEVICE = 2, |
16 | SAS_FANOUT_EXPANDER_DEVICE, | 17 | SAS_FANOUT_EXPANDER_DEVICE = 3, |
17 | }; | ||
18 | |||
19 | enum sas_protocol { | ||
20 | SAS_PROTOCOL_SATA = 0x01, | ||
21 | SAS_PROTOCOL_SMP = 0x02, | ||
22 | SAS_PROTOCOL_STP = 0x04, | ||
23 | SAS_PROTOCOL_SSP = 0x08, | ||
24 | }; | 18 | }; |
25 | 19 | ||
26 | static inline int sas_protocol_ata(enum sas_protocol proto) | 20 | static inline int sas_protocol_ata(enum sas_protocol proto) |