1 files changed, 8 insertions, 4 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index 72731d7d189e..bdc53c6cc962 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -811,9 +811,9 @@ struct input_dev {
 
         void *private;
 
-        char *name;
-        char *phys;
-        char *uniq;
+        const char *name;
+        const char *phys;
+        const char *uniq;
         struct input_id id;
 
         unsigned long evbit[NBITS(EV_MAX)];
@@ -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;
@@ -1015,7 +1019,7 @@ static inline void input_set_abs_params(struct input_dev *dev, int axis, int min
         dev->absbit[LONG(axis)] |= BIT(axis);
 }
 
-extern struct class_simple *input_class;
+extern struct class *input_class;
 
 #endif
 #endif