Auto merge with /home/aegl/GIT/linus

[linux-2.6] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index b70df8fe60e677df475d939bc9243daf7f4846d2..b9cc0ac71f44db7b6e361bca0a789defacdd8886 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -328,6 +328,11 @@ struct input_absinfo {
 #define KEY_BRIGHTNESSUP       225
 #define KEY_MEDIA              226
 
+#define KEY_SWITCHVIDEOMODE    227
+#define KEY_KBDILLUMTOGGLE     228
+#define KEY_KBDILLUMDOWN       229
+#define KEY_KBDILLUMUP         230
+
 #define KEY_UNKNOWN            240
 
 #define BTN_MISC               0x100
@@ -854,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;
@@ -1010,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