projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[profile/ivi/kernel-x86-ivi.git]
/
include
/
linux
/
input.h
diff --git
a/include/linux/input.h
b/include/linux/input.h
index
0057698
..
51af441
100644
(file)
--- a/
include/linux/input.h
+++ b/
include/linux/input.h
@@
-1227,7
+1227,7
@@
struct input_dev {
int (*flush)(struct input_dev *dev, struct file *file);
int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value);
- struct input_handle *grab;
+ struct input_handle
__rcu
*grab;
spinlock_t event_lock;
struct mutex mutex;