diff options
author | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 08:55:12 +0100 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 08:55:12 +0100 |
commit | fe709ed827d370e6b0c0a9f9456da1c22bdcd118 (patch) | |
tree | c5a7fd72a745a5f6656a58acc9a1d277e26f9595 /drivers/scsi/constants.c | |
parent | Merge tag 'isci-for-3.6' into for-next (diff) | |
parent | [SCSI] st: remove st_mutex (diff) | |
download | linux-dev-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.tar.xz linux-dev-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.zip |
Merge SCSI misc branch into isci-for-3.6 tag
Diffstat (limited to 'drivers/scsi/constants.c')
-rw-r--r-- | drivers/scsi/constants.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c index 450e011f981a..76e4c039f0d5 100644 --- a/drivers/scsi/constants.c +++ b/drivers/scsi/constants.c @@ -1422,7 +1422,8 @@ static const char * const hostbyte_table[]={ "DID_OK", "DID_NO_CONNECT", "DID_BUS_BUSY", "DID_TIME_OUT", "DID_BAD_TARGET", "DID_ABORT", "DID_PARITY", "DID_ERROR", "DID_RESET", "DID_BAD_INTR", "DID_PASSTHROUGH", "DID_SOFT_ERROR", "DID_IMM_RETRY", "DID_REQUEUE", -"DID_TRANSPORT_DISRUPTED", "DID_TRANSPORT_FAILFAST" }; +"DID_TRANSPORT_DISRUPTED", "DID_TRANSPORT_FAILFAST", "DID_TARGET_FAILURE", +"DID_NEXUS_FAILURE" }; #define NUM_HOSTBYTE_STRS ARRAY_SIZE(hostbyte_table) static const char * const driverbyte_table[]={ |