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/rdma/ib_user_cm.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/rdma/ib_user_cm.h')
| -rw-r--r-- | include/rdma/ib_user_cm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/rdma/ib_user_cm.h b/include/rdma/ib_user_cm.h index bd3d380781e0..f79014aa28f9 100644 --- a/include/rdma/ib_user_cm.h +++ b/include/rdma/ib_user_cm.h | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #ifndef IB_USER_CM_H | 34 | #ifndef IB_USER_CM_H |
| 35 | #define IB_USER_CM_H | 35 | #define IB_USER_CM_H |
| 36 | 36 | ||
| 37 | #include <linux/types.h> | ||
| 37 | #include <rdma/ib_user_sa.h> | 38 | #include <rdma/ib_user_sa.h> |
| 38 | 39 | ||
| 39 | #define IB_USER_CM_ABI_VERSION 5 | 40 | #define IB_USER_CM_ABI_VERSION 5 |