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 branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus
[pandora-kernel.git]
/
net
/
bluetooth
/
hidp
/
hidp.h
diff --git
a/net/bluetooth/hidp/hidp.h
b/net/bluetooth/hidp/hidp.h
index
a326601
..
e503c89
100644
(file)
--- a/
net/bluetooth/hidp/hidp.h
+++ b/
net/bluetooth/hidp/hidp.h
@@
-145,10
+145,14
@@
struct hidp_session {
struct input_dev *input;
+ struct hid_device *hid;
+
struct timer_list timer;
struct sk_buff_head ctrl_transmit;
struct sk_buff_head intr_transmit;
+
+ struct hidp_connadd_req *req;
};
static inline void hidp_schedule(struct hidp_session *session)