aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@g5.osdl.org> 2005-09-10 15:54:41 -0700
committerGravatar Linus Torvalds <torvalds@g5.osdl.org> 2005-09-10 15:54:41 -0700
commit7f93220b624de1b7d9fcff8a2cebd6fce7ed4665 (patch)
tree5070ec25635008082b47a646d64b4359896c0faa /include
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff)
parentInput: i8042 - use kzalloc instead of kcalloc (diff)
downloadlinux-7f93220b624de1b7d9fcff8a2cebd6fce7ed4665.tar.gz
linux-7f93220b624de1b7d9fcff8a2cebd6fce7ed4665.tar.bz2
linux-7f93220b624de1b7d9fcff8a2cebd6fce7ed4665.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'include')
-rw-r--r--include/linux/input.h8
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 {
#define KEY_SCROLLDOWN 178
#define KEY_KPLEFTPAREN 179
#define KEY_KPRIGHTPAREN 180
+#define KEY_NEW 181
+#define KEY_REDO 182
#define KEY_F13 183
#define KEY_F14 184
@@ -335,6 +337,12 @@ struct input_absinfo {
#define KEY_KBDILLUMDOWN 229
#define KEY_KBDILLUMUP 230
+#define KEY_SEND 231
+#define KEY_REPLY 232
+#define KEY_FORWARDMAIL 233
+#define KEY_SAVE 234
+#define KEY_DOCUMENTS 235
+
#define KEY_UNKNOWN 240
#define BTN_MISC 0x100