diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 03:06:26 -0400 |
| commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
| tree | 8b639000418e2756bf6baece4e00e07d2534bccc /include/linux/input.h | |
| parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
| parent | 9d2e173644bb5c42ff1b280fbdda3f195a7cf1f7 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 73a8c6ee595b..771d6d85667d 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -666,6 +666,13 @@ struct input_keymap_entry { | |||
| 666 | #define KEY_TOUCHPAD_ON 0x213 | 666 | #define KEY_TOUCHPAD_ON 0x213 |
| 667 | #define KEY_TOUCHPAD_OFF 0x214 | 667 | #define KEY_TOUCHPAD_OFF 0x214 |
| 668 | 668 | ||
| 669 | #define KEY_CAMERA_ZOOMIN 0x215 | ||
| 670 | #define KEY_CAMERA_ZOOMOUT 0x216 | ||
| 671 | #define KEY_CAMERA_UP 0x217 | ||
| 672 | #define KEY_CAMERA_DOWN 0x218 | ||
| 673 | #define KEY_CAMERA_LEFT 0x219 | ||
| 674 | #define KEY_CAMERA_RIGHT 0x21a | ||
| 675 | |||
| 669 | #define BTN_TRIGGER_HAPPY 0x2c0 | 676 | #define BTN_TRIGGER_HAPPY 0x2c0 |
| 670 | #define BTN_TRIGGER_HAPPY1 0x2c0 | 677 | #define BTN_TRIGGER_HAPPY1 0x2c0 |
| 671 | #define BTN_TRIGGER_HAPPY2 0x2c1 | 678 | #define BTN_TRIGGER_HAPPY2 0x2c1 |