diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 18:54:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 18:54:41 -0400 |
commit | 7f93220b624de1b7d9fcff8a2cebd6fce7ed4665 (patch) | |
tree | 5070ec25635008082b47a646d64b4359896c0faa /include | |
parent | 2b8dfec8c8fa4ba5bc946a602e94e99861462cad (diff) | |
parent | d39969deee4b541be4ee5789a2e4c14511c886e2 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/input.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 4767e5429534..e8c296ff6257 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
@@ -289,6 +289,8 @@ struct input_absinfo { | |||
289 | #define KEY_SCROLLDOWN 178 | 289 | #define KEY_SCROLLDOWN 178 |
290 | #define KEY_KPLEFTPAREN 179 | 290 | #define KEY_KPLEFTPAREN 179 |
291 | #define KEY_KPRIGHTPAREN 180 | 291 | #define KEY_KPRIGHTPAREN 180 |
292 | #define KEY_NEW 181 | ||
293 | #define KEY_REDO 182 | ||
292 | 294 | ||
293 | #define KEY_F13 183 | 295 | #define KEY_F13 183 |
294 | #define KEY_F14 184 | 296 | #define KEY_F14 184 |
@@ -335,6 +337,12 @@ struct input_absinfo { | |||
335 | #define KEY_KBDILLUMDOWN 229 | 337 | #define KEY_KBDILLUMDOWN 229 |
336 | #define KEY_KBDILLUMUP 230 | 338 | #define KEY_KBDILLUMUP 230 |
337 | 339 | ||
340 | #define KEY_SEND 231 | ||
341 | #define KEY_REPLY 232 | ||
342 | #define KEY_FORWARDMAIL 233 | ||
343 | #define KEY_SAVE 234 | ||
344 | #define KEY_DOCUMENTS 235 | ||
345 | |||
338 | #define KEY_UNKNOWN 240 | 346 | #define KEY_UNKNOWN 240 |
339 | 347 | ||
340 | #define BTN_MISC 0x100 | 348 | #define BTN_MISC 0x100 |