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 'doc', 'multitouch', 'upstream' and 'upstream-fixes' 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
13de5fa
..
c9be803
100644
(file)
--- a/
net/bluetooth/hidp/hidp.h
+++ b/
net/bluetooth/hidp/hidp.h
@@
-80,7
+80,7
@@
#define HIDP_VIRTUAL_CABLE_UNPLUG 0
#define HIDP_BOOT_PROTOCOL_MODE 1
#define HIDP_BLUETOOTH_VENDOR_ID 9
-#define
HIDP_WAITING_FOR_RETURN
10
+#define
HIDP_WAITING_FOR_RETURN
10
#define HIDP_WAITING_FOR_SEND_ACK 11
struct hidp_connadd_req {