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/pmcraid.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/scsi/pmcraid.h')
| -rw-r--r-- | drivers/scsi/pmcraid.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h index 3441b3f90827..2752b56cad56 100644 --- a/drivers/scsi/pmcraid.h +++ b/drivers/scsi/pmcraid.h | |||
| @@ -771,11 +771,11 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = { | |||
| 771 | {0x01180600, IOASC_LOG_LEVEL_MUST, | 771 | {0x01180600, IOASC_LOG_LEVEL_MUST, |
| 772 | "Recovered Error, soft media error, sector reassignment suggested"}, | 772 | "Recovered Error, soft media error, sector reassignment suggested"}, |
| 773 | {0x015D0000, IOASC_LOG_LEVEL_MUST, | 773 | {0x015D0000, IOASC_LOG_LEVEL_MUST, |
| 774 | "Recovered Error, failure prediction thresold exceeded"}, | 774 | "Recovered Error, failure prediction threshold exceeded"}, |
| 775 | {0x015D9200, IOASC_LOG_LEVEL_MUST, | 775 | {0x015D9200, IOASC_LOG_LEVEL_MUST, |
| 776 | "Recovered Error, soft Cache Card Battery error thresold"}, | 776 | "Recovered Error, soft Cache Card Battery error threshold"}, |
| 777 | {0x015D9200, IOASC_LOG_LEVEL_MUST, | 777 | {0x015D9200, IOASC_LOG_LEVEL_MUST, |
| 778 | "Recovered Error, soft Cache Card Battery error thresold"}, | 778 | "Recovered Error, soft Cache Card Battery error threshold"}, |
| 779 | {0x02048000, IOASC_LOG_LEVEL_MUST, | 779 | {0x02048000, IOASC_LOG_LEVEL_MUST, |
| 780 | "Not Ready, IOA Reset Required"}, | 780 | "Not Ready, IOA Reset Required"}, |
| 781 | {0x02408500, IOASC_LOG_LEVEL_MUST, | 781 | {0x02408500, IOASC_LOG_LEVEL_MUST, |