Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually

[pandora-kernel.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 9d9598e..b9cc0ac 100644 (file)
--- 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;