summaryrefslogtreecommitdiff
path: root/include/linux/input.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pretzel.yyz.us>2005-06-27 22:05:03 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-27 22:05:03 -0400
commit1bad3f4050b2a641bbfeaddb2717b28247311e9c (patch)
treebdc2efda40f48e0fbb64e6b9aca793e95ac72fc4 /include/linux/input.h
parent747802ab478399f13ff57751c2ebd22577be4eeb (diff)
parentc7b645f934e52a54af58142d91fb51f881f8ce26 (diff)
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/input.h')
-rw-r--r--include/linux/input.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h
index 9d9598ed760d..b9cc0ac71f44 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -859,6 +859,10 @@ struct input_dev {
int (*erase_effect)(struct input_dev *dev, int effect_id);
struct input_handle *grab;
+
+ struct semaphore sem; /* serializes open and close operations */
+ unsigned int users;
+
struct device *dev;
struct list_head h_list;