diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/scsi/mpt2sas/mpt2sas_ctl.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_ctl.h')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.h b/drivers/scsi/mpt2sas/mpt2sas_ctl.h index 211f296dd191..8a5eeb1a5c84 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.h +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.h | |||
| @@ -313,7 +313,7 @@ struct mpt2_ioctl_btdh_mapping { | |||
| 313 | * struct mpt2_diag_register - application register with driver | 313 | * struct mpt2_diag_register - application register with driver |
| 314 | * @hdr - generic header | 314 | * @hdr - generic header |
| 315 | * @reserved - | 315 | * @reserved - |
| 316 | * @buffer_type - specifies either TRACE or SNAPSHOT | 316 | * @buffer_type - specifies either TRACE, SNAPSHOT, or EXTENDED |
| 317 | * @application_flags - misc flags | 317 | * @application_flags - misc flags |
| 318 | * @diagnostic_flags - specifies flags affecting command processing | 318 | * @diagnostic_flags - specifies flags affecting command processing |
| 319 | * @product_specific - product specific information | 319 | * @product_specific - product specific information |
| @@ -352,7 +352,7 @@ struct mpt2_diag_unregister { | |||
| 352 | * struct mpt2_diag_query - query relevant info associated with diag buffers | 352 | * struct mpt2_diag_query - query relevant info associated with diag buffers |
| 353 | * @hdr - generic header | 353 | * @hdr - generic header |
| 354 | * @reserved - | 354 | * @reserved - |
| 355 | * @buffer_type - specifies either TRACE or SNAPSHOT | 355 | * @buffer_type - specifies either TRACE, SNAPSHOT, or EXTENDED |
| 356 | * @application_flags - misc flags | 356 | * @application_flags - misc flags |
| 357 | * @diagnostic_flags - specifies flags affecting command processing | 357 | * @diagnostic_flags - specifies flags affecting command processing |
| 358 | * @product_specific - product specific information | 358 | * @product_specific - product specific information |