diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 15:16:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 15:16:07 -0500 |
commit | 12dbf3fc4d06d2c0c4c44dc0612df04248b3cfd3 (patch) | |
tree | 158610ef6c7711afb60d78956ab4b131bf6a08ef /include/scsi/scsi_transport_spi.h | |
parent | 61b7efddc5256225099d13185659e9ad9d8abc8a (diff) | |
parent | fc091e03820bf67e543362bd40959701a71d0c27 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'include/scsi/scsi_transport_spi.h')
-rw-r--r-- | include/scsi/scsi_transport_spi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h index 54a89611e9c5..2b5930ba69ec 100644 --- a/include/scsi/scsi_transport_spi.h +++ b/include/scsi/scsi_transport_spi.h | |||
@@ -54,7 +54,7 @@ struct spi_transport_attrs { | |||
54 | unsigned int support_qas; /* supports quick arbitration and selection */ | 54 | unsigned int support_qas; /* supports quick arbitration and selection */ |
55 | /* Private Fields */ | 55 | /* Private Fields */ |
56 | unsigned int dv_pending:1; /* Internal flag */ | 56 | unsigned int dv_pending:1; /* Internal flag */ |
57 | struct semaphore dv_sem; /* semaphore to serialise dv */ | 57 | struct mutex dv_mutex; /* semaphore to serialise dv */ |
58 | }; | 58 | }; |
59 | 59 | ||
60 | enum spi_signal_type { | 60 | enum spi_signal_type { |