diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-28 07:47:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-28 07:47:55 -0700 |
commit | 2dd3c1df95fb29e9227f16ccd7d786d129e2b34d (patch) | |
tree | 60f05d91184e73d3e85b125f6e13ac0ceedc3231 /include | |
parent | 5c382300876f2337f7b945c159ffcaf285f296ea (diff) | |
parent | a1c337afaf4ec4d4eabc75a5e1170d03161de4e1 (diff) | |
download | linux-3.10-2dd3c1df95fb29e9227f16ccd7d786d129e2b34d.tar.gz linux-3.10-2dd3c1df95fb29e9227f16ccd7d786d129e2b34d.tar.bz2 linux-3.10-2dd3c1df95fb29e9227f16ccd7d786d129e2b34d.zip |
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 e16cf94870f..e6f4c9e55df 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -665,7 +665,6 @@ struct ib_ucontext { struct list_head qp_list; struct list_head srq_list; struct list_head ah_list; - spinlock_t lock; }; struct ib_uobject { |