diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 01:20:35 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 01:20:35 +0300 |
| commit | febb187761b02fce7d61b9c897d0e701f672b5ee (patch) | |
| tree | a953d8a59f7f7fd7bb34466143a8f3722e14e479 /include | |
| parent | 8c27eba54970c6ebbb408186e5baa2274435e869 (diff) | |
| parent | 35baef2afb6270ff731b4d766f0b163c3912304f (diff) | |
| download | linux-febb187761b02fce7d61b9c897d0e701f672b5ee.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: adds the context menu key (HUT GenDesc 0x84)
Input: add definitions for frame forward and frame back keys
Input: bf54x-keys - keypad does not exist on BF544 parts
Input: gpio-keys - request and configure GPIOs
Input: i8042 - add i8042.noloop quirk for MS Virtual Machine
Sonypi: use synchronize_irq instead of sycnronize_sched
sonypi: fit input devices into sysfs tree
sony-laptop: fit input devices into sysfs tree
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index b45f240a8c45..2075d6da2a31 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -530,6 +530,11 @@ struct input_absinfo { #define KEY_DOLLAR 0x1b2 #define KEY_EURO 0x1b3 +#define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ +#define KEY_FRAMEFORWARD 0x1b5 + +#define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ + #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 #define KEY_INS_LINE 0x1c2 |