diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/message/fusion/lsi/mpi_ioc.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/message/fusion/lsi/mpi_ioc.h')
| -rw-r--r-- | drivers/message/fusion/lsi/mpi_ioc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h index 8faa4fab7b89..fd6222882a0e 100644 --- a/drivers/message/fusion/lsi/mpi_ioc.h +++ b/drivers/message/fusion/lsi/mpi_ioc.h | |||
| @@ -841,6 +841,7 @@ typedef struct _EVENT_DATA_SAS_PHY_LINK_STATUS | |||
| 841 | #define MPI_EVENT_SAS_PLS_LR_RATE_SATA_OOB_COMPLETE (0x03) | 841 | #define MPI_EVENT_SAS_PLS_LR_RATE_SATA_OOB_COMPLETE (0x03) |
| 842 | #define MPI_EVENT_SAS_PLS_LR_RATE_1_5 (0x08) | 842 | #define MPI_EVENT_SAS_PLS_LR_RATE_1_5 (0x08) |
| 843 | #define MPI_EVENT_SAS_PLS_LR_RATE_3_0 (0x09) | 843 | #define MPI_EVENT_SAS_PLS_LR_RATE_3_0 (0x09) |
| 844 | #define MPI_EVENT_SAS_PLS_LR_RATE_6_0 (0x0A) | ||
| 844 | 845 | ||
| 845 | /* SAS Discovery Event data */ | 846 | /* SAS Discovery Event data */ |
| 846 | 847 | ||