diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-16 15:47:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-16 15:47:44 -0500 |
| commit | 26d451b603e754ded83f0e5becab2a78253ad100 (patch) | |
| tree | 99209544823dbdb5735ae5f7234c83beea2f6a22 /drivers/message/fusion/mptctl.h | |
| parent | 90f9dd8f72773152b69042debd6b9ed6d224703a (diff) | |
| parent | 65110b2168950a19cc78b5027ed18cb811fbdae8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/message/fusion/mptctl.h')
| -rw-r--r-- | drivers/message/fusion/mptctl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptctl.h b/drivers/message/fusion/mptctl.h index 518996e03481..a2f8a97992e6 100644 --- a/drivers/message/fusion/mptctl.h +++ b/drivers/message/fusion/mptctl.h | |||
| @@ -169,8 +169,10 @@ struct mpt_ioctl_pci_info2 { | |||
| 169 | * Read only. | 169 | * Read only. |
| 170 | * Data starts at offset 0xC | 170 | * Data starts at offset 0xC |
| 171 | */ | 171 | */ |
| 172 | #define MPT_IOCTL_INTERFACE_FC (0x01) | ||
| 173 | #define MPT_IOCTL_INTERFACE_SCSI (0x00) | 172 | #define MPT_IOCTL_INTERFACE_SCSI (0x00) |
| 173 | #define MPT_IOCTL_INTERFACE_FC (0x01) | ||
| 174 | #define MPT_IOCTL_INTERFACE_FC_IP (0x02) | ||
| 175 | #define MPT_IOCTL_INTERFACE_SAS (0x03) | ||
| 174 | #define MPT_IOCTL_VERSION_LENGTH (32) | 176 | #define MPT_IOCTL_VERSION_LENGTH (32) |
| 175 | 177 | ||
| 176 | struct mpt_ioctl_iocinfo { | 178 | struct mpt_ioctl_iocinfo { |