Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index e428382ca28a59aac1a16f1f5926f28a3c7fb24b..f3a7794a18c4d6de24065f797baf4ba97c34694b 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -664,6 +664,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
@@ -1154,8 +1161,6 @@ struct ff_effect {
  *     sparse keymaps. If not supplied default mechanism will be used.
  *     The method is being called while holding event_lock and thus must
  *     not sleep
- * @getkeycode_new: transition method
- * @setkeycode_new: transition method
  * @ff: force feedback structure associated with the device if device
  *     supports force feedback effects
  * @repeat_key: stores key code of the last key pressed; used to implement
@@ -1234,14 +1239,10 @@ struct input_dev {
        void *keycode;
 
        int (*setkeycode)(struct input_dev *dev,
-                         unsigned int scancode, unsigned int keycode);
+                         const struct input_keymap_entry *ke,
+                         unsigned int *old_keycode);
        int (*getkeycode)(struct input_dev *dev,
-                         unsigned int scancode, unsigned int *keycode);
-       int (*setkeycode_new)(struct input_dev *dev,
-                             const struct input_keymap_entry *ke,
-                             unsigned int *old_keycode);
-       int (*getkeycode_new)(struct input_dev *dev,
-                             struct input_keymap_entry *ke);
+                         struct input_keymap_entry *ke);
 
        struct ff_device *ff;