diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/scsi/mpt2sas/mpt2sas_scsih.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_scsih.c')
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_scsih.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index 86ab32d7ab15..756e509d495c 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c | |||
| @@ -2894,7 +2894,7 @@ _scsih_normalize_sense(char *sense_buffer, struct sense_info *data) | |||
| 2894 | 2894 | ||
| 2895 | #ifdef CONFIG_SCSI_MPT2SAS_LOGGING | 2895 | #ifdef CONFIG_SCSI_MPT2SAS_LOGGING |
| 2896 | /** | 2896 | /** |
| 2897 | * _scsih_scsi_ioc_info - translated non-succesfull SCSI_IO request | 2897 | * _scsih_scsi_ioc_info - translated non-successfull SCSI_IO request |
| 2898 | * @ioc: per adapter object | 2898 | * @ioc: per adapter object |
| 2899 | * @scmd: pointer to scsi command object | 2899 | * @scmd: pointer to scsi command object |
| 2900 | * @mpi_reply: reply mf payload returned from firmware | 2900 | * @mpi_reply: reply mf payload returned from firmware |