diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-05 03:12:21 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-05 03:12:21 -0400 |
| commit | 4e29402fe4b2006c994eed5020c42b2cc87d9b42 (patch) | |
| tree | c0229c107045ab21487729f6a6cab6b70ed30bfa /include/linux/input.h | |
| parent | f8852b12200df393b0a4db1a7052454bbc335443 (diff) | |
| parent | 00b317a41c5428b13eb7e5b4bbc691b1aa7afa80 (diff) | |
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
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 056ae8a5bd9b..f3a7794a18c4 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -664,6 +664,13 @@ struct input_keymap_entry { | |||
| 664 | #define KEY_TOUCHPAD_ON 0x213 | 664 | #define KEY_TOUCHPAD_ON 0x213 |
| 665 | #define KEY_TOUCHPAD_OFF 0x214 | 665 | #define KEY_TOUCHPAD_OFF 0x214 |
| 666 | 666 | ||
| 667 | #define KEY_CAMERA_ZOOMIN 0x215 | ||
| 668 | #define KEY_CAMERA_ZOOMOUT 0x216 | ||
| 669 | #define KEY_CAMERA_UP 0x217 | ||
| 670 | #define KEY_CAMERA_DOWN 0x218 | ||
| 671 | #define KEY_CAMERA_LEFT 0x219 | ||
| 672 | #define KEY_CAMERA_RIGHT 0x21a | ||
| 673 | |||
| 667 | #define BTN_TRIGGER_HAPPY 0x2c0 | 674 | #define BTN_TRIGGER_HAPPY 0x2c0 |
| 668 | #define BTN_TRIGGER_HAPPY1 0x2c0 | 675 | #define BTN_TRIGGER_HAPPY1 0x2c0 |
| 669 | #define BTN_TRIGGER_HAPPY2 0x2c1 | 676 | #define BTN_TRIGGER_HAPPY2 0x2c1 |