diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-28 10:47:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-28 10:47:55 -0400 |
| commit | 2dd3c1df95fb29e9227f16ccd7d786d129e2b34d (patch) | |
| tree | 60f05d91184e73d3e85b125f6e13ac0ceedc3231 /include | |
| parent | 5c382300876f2337f7b945c159ffcaf285f296ea (diff) | |
| parent | a1c337afaf4ec4d4eabc75a5e1170d03161de4e1 (diff) | |
Merge branch 'for-linus' from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Diffstat (limited to 'include')
| -rw-r--r-- | include/rdma/ib_verbs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index e16cf94870f2..e6f4c9e55df7 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h | |||
| @@ -665,7 +665,6 @@ struct ib_ucontext { | |||
| 665 | struct list_head qp_list; | 665 | struct list_head qp_list; |
| 666 | struct list_head srq_list; | 666 | struct list_head srq_list; |
| 667 | struct list_head ah_list; | 667 | struct list_head ah_list; |
| 668 | spinlock_t lock; | ||
| 669 | }; | 668 | }; |
| 670 | 669 | ||
| 671 | struct ib_uobject { | 670 | struct ib_uobject { |