diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /drivers/scsi/mpt2sas/mpt2sas_base.h | |
parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_base.h')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.h | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h index 6945ff4d382e..babd4cc0cb25 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.h +++ b/drivers/scsi/mpt2sas/mpt2sas_base.h | |||
@@ -68,11 +68,11 @@ | |||
68 | #define MPT2SAS_DRIVER_NAME "mpt2sas" | 68 | #define MPT2SAS_DRIVER_NAME "mpt2sas" |
69 | #define MPT2SAS_AUTHOR "LSI Corporation <DL-MPTFusionLinux@lsi.com>" | 69 | #define MPT2SAS_AUTHOR "LSI Corporation <DL-MPTFusionLinux@lsi.com>" |
70 | #define MPT2SAS_DESCRIPTION "LSI MPT Fusion SAS 2.0 Device Driver" | 70 | #define MPT2SAS_DESCRIPTION "LSI MPT Fusion SAS 2.0 Device Driver" |
71 | #define MPT2SAS_DRIVER_VERSION "00.100.11.16" | 71 | #define MPT2SAS_DRIVER_VERSION "01.100.02.00" |
72 | #define MPT2SAS_MAJOR_VERSION 00 | 72 | #define MPT2SAS_MAJOR_VERSION 00 |
73 | #define MPT2SAS_MINOR_VERSION 100 | 73 | #define MPT2SAS_MINOR_VERSION 100 |
74 | #define MPT2SAS_BUILD_VERSION 11 | 74 | #define MPT2SAS_BUILD_VERSION 02 |
75 | #define MPT2SAS_RELEASE_VERSION 16 | 75 | #define MPT2SAS_RELEASE_VERSION 00 |
76 | 76 | ||
77 | /* | 77 | /* |
78 | * Set MPT2SAS_SG_DEPTH value based on user input. | 78 | * Set MPT2SAS_SG_DEPTH value based on user input. |
@@ -130,6 +130,30 @@ | |||
130 | #define MPT2SAS_ERR_FMT KERN_ERR MPT2SAS_FMT | 130 | #define MPT2SAS_ERR_FMT KERN_ERR MPT2SAS_FMT |
131 | 131 | ||
132 | /* | 132 | /* |
133 | * Dell HBA branding | ||
134 | */ | ||
135 | #define MPT2SAS_DELL_BRANDING_SIZE 32 | ||
136 | |||
137 | #define MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING "Dell 6Gbps SAS HBA" | ||
138 | #define MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING "Dell PERC H200 Adapter" | ||
139 | #define MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING "Dell PERC H200 Integrated" | ||
140 | #define MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING "Dell PERC H200 Modular" | ||
141 | #define MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING "Dell PERC H200 Embedded" | ||
142 | #define MPT2SAS_DELL_PERC_H200_BRANDING "Dell PERC H200" | ||
143 | #define MPT2SAS_DELL_6GBPS_SAS_BRANDING "Dell 6Gbps SAS" | ||
144 | |||
145 | /* | ||
146 | * Dell HBA SSDIDs | ||
147 | */ | ||
148 | #define MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID 0x1F1C | ||
149 | #define MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID 0x1F1D | ||
150 | #define MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID 0x1F1E | ||
151 | #define MPT2SAS_DELL_PERC_H200_MODULAR_SSDID 0x1F1F | ||
152 | #define MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID 0x1F20 | ||
153 | #define MPT2SAS_DELL_PERC_H200_SSDID 0x1F21 | ||
154 | #define MPT2SAS_DELL_6GBPS_SAS_SSDID 0x1F22 | ||
155 | |||
156 | /* | ||
133 | * per target private data | 157 | * per target private data |
134 | */ | 158 | */ |
135 | #define MPT_TARGET_FLAGS_RAID_COMPONENT 0x01 | 159 | #define MPT_TARGET_FLAGS_RAID_COMPONENT 0x01 |