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 /include/linux/rio_ids.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 'include/linux/rio_ids.h')
| -rw-r--r-- | include/linux/rio_ids.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/rio_ids.h b/include/linux/rio_ids.h index db50e1c288b7..0cee0152aca9 100644 --- a/include/linux/rio_ids.h +++ b/include/linux/rio_ids.h | |||
| @@ -34,5 +34,10 @@ | |||
| 34 | #define RIO_DID_IDTCPS16 0x035b | 34 | #define RIO_DID_IDTCPS16 0x035b |
| 35 | #define RIO_DID_IDTCPS6Q 0x035f | 35 | #define RIO_DID_IDTCPS6Q 0x035f |
| 36 | #define RIO_DID_IDTCPS10Q 0x035e | 36 | #define RIO_DID_IDTCPS10Q 0x035e |
| 37 | #define RIO_DID_IDTCPS1848 0x0374 | ||
| 38 | #define RIO_DID_IDTCPS1432 0x0375 | ||
| 39 | #define RIO_DID_IDTCPS1616 0x0379 | ||
| 40 | #define RIO_DID_IDTVPS1616 0x0377 | ||
| 41 | #define RIO_DID_IDTSPS1616 0x0378 | ||
| 37 | 42 | ||
| 38 | #endif /* LINUX_RIO_IDS_H */ | 43 | #endif /* LINUX_RIO_IDS_H */ |