diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /include/linux/input.h | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index feaea76f0ef3..a5802c9c81a4 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -536,8 +536,8 @@ struct input_absinfo { | |||
| 536 | 536 | ||
| 537 | #define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ | 537 | #define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ |
| 538 | #define KEY_FRAMEFORWARD 0x1b5 | 538 | #define KEY_FRAMEFORWARD 0x1b5 |
| 539 | |||
| 540 | #define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ | 539 | #define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ |
| 540 | #define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */ | ||
| 541 | 541 | ||
| 542 | #define KEY_DEL_EOL 0x1c0 | 542 | #define KEY_DEL_EOL 0x1c0 |
| 543 | #define KEY_DEL_EOS 0x1c1 | 543 | #define KEY_DEL_EOS 0x1c1 |