diff options
| author | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
|---|---|---|
| committer | Mark Brown <[email protected]> | 2015-10-12 18:09:27 +0100 | 
| commit | 79828b4fa835f73cdaf4bffa48696abdcbea9d02 (patch) | |
| tree | 5e0fa7156acb75ba603022bc807df8f2fedb97a8 /drivers/scsi/mpt3sas/mpi/mpi2.h | |
| parent | 721b51fcf91898299d96f4b72cb9434cda29dce6 (diff) | |
| parent | 8c1a9d6323abf0fb1e5dad96cf3f1c783505ea5a (diff) | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645
Diffstat (limited to 'drivers/scsi/mpt3sas/mpi/mpi2.h')
| -rw-r--r-- | drivers/scsi/mpt3sas/mpi/mpi2.h | 8 | 
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/mpt3sas/mpi/mpi2.h b/drivers/scsi/mpt3sas/mpi/mpi2.h index c34c1157907b..ec27ad2d186f 100644 --- a/drivers/scsi/mpt3sas/mpi/mpi2.h +++ b/drivers/scsi/mpt3sas/mpi/mpi2.h @@ -8,7 +8,7 @@   *                 scatter/gather formats.   * Creation Date:  June 21, 2006   * - * mpi2.h Version:  02.00.31 + * mpi2.h Version:  02.00.35   *   * NOTE: Names (typedefs, defines, etc.) beginning with an MPI25 or Mpi25   *       prefix are for use only on MPI v2.5 products, and must not be used @@ -88,6 +88,10 @@   *                     Added MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET.   * 04-09-13  02.00.30  Bumped MPI2_HEADER_VERSION_UNIT.   * 04-17-13  02.00.31  Bumped MPI2_HEADER_VERSION_UNIT. + * 08-19-13  02.00.32  Bumped MPI2_HEADER_VERSION_UNIT. + * 12-05-13  02.00.33  Bumped MPI2_HEADER_VERSION_UNIT. + * 01-08-14  02.00.34  Bumped MPI2_HEADER_VERSION_UNIT + * 06-13-14  02.00.35  Bumped MPI2_HEADER_VERSION_UNIT.   * --------------------------------------------------------------------------   */ @@ -121,7 +125,7 @@  #define MPI2_VERSION_02_05                  (0x0205)  /*Unit and Dev versioning for this MPI header set */ -#define MPI2_HEADER_VERSION_UNIT            (0x1F) +#define MPI2_HEADER_VERSION_UNIT            (0x23)  #define MPI2_HEADER_VERSION_DEV             (0x00)  #define MPI2_HEADER_VERSION_UNIT_MASK       (0xFF00)  #define MPI2_HEADER_VERSION_UNIT_SHIFT      (8)  |