Merge branch 'x86/urgent' into x86-mm

[~andy/linux] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 0cc25e4ce2ab1a12ee4f8517a9b7716ceecf7a94..771d6d85667d68a17c24c452979f8d37cc628082 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -167,6 +167,7 @@ struct input_keymap_entry {
 #define SYN_REPORT             0
 #define SYN_CONFIG             1
 #define SYN_MT_REPORT          2
+#define SYN_DROPPED            3
 
 /*
  * Keys and buttons
@@ -665,6 +666,13 @@ struct input_keymap_entry {
 #define KEY_TOUCHPAD_ON                0x213
 #define KEY_TOUCHPAD_OFF       0x214
 
+#define KEY_CAMERA_ZOOMIN      0x215
+#define KEY_CAMERA_ZOOMOUT     0x216
+#define KEY_CAMERA_UP          0x217
+#define KEY_CAMERA_DOWN                0x218
+#define KEY_CAMERA_LEFT                0x219
+#define KEY_CAMERA_RIGHT       0x21a
+
 #define BTN_TRIGGER_HAPPY              0x2c0
 #define BTN_TRIGGER_HAPPY1             0x2c0
 #define BTN_TRIGGER_HAPPY2             0x2c1