git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
infiniband
/
core
/
uverbs.h
diff --git
a/drivers/infiniband/core/uverbs.h
b/drivers/infiniband/core/uverbs.h
index
bb9bee5
..
102a59c
100644
(file)
--- a/
drivers/infiniband/core/uverbs.h
+++ b/
drivers/infiniband/core/uverbs.h
@@
-42,6
+42,7
@@
#include <linux/kref.h>
#include <linux/idr.h>
#include <linux/mutex.h>
#include <linux/kref.h>
#include <linux/idr.h>
#include <linux/mutex.h>
+#include <linux/completion.h>
#include <rdma/ib_verbs.h>
#include <rdma/ib_user_verbs.h>
#include <rdma/ib_verbs.h>
#include <rdma/ib_user_verbs.h>
@@
-69,6
+70,7
@@
struct ib_uverbs_device {
struct kref ref;
struct ib_uverbs_device {
struct kref ref;
+ struct completion comp;
int devnum;
struct cdev *dev;
struct class_device *class_dev;
int devnum;
struct cdev *dev;
struct class_device *class_dev;