Merge commit 'v3.1-rc4' into next

[karo-tx-linux.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 068784e17972a1ffd907f4365bd5f774e70bcfdf..57add325e7a85a99591dfae1b75f90c422e15520 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -438,6 +438,8 @@ struct input_keymap_entry {
 #define KEY_WIMAX              246
 #define KEY_RFKILL             247     /* Key that controls all radios */
 
+#define KEY_MICMUTE            248     /* Mute / unmute the microphone */
+
 /* Code 255 is reserved for special needs of AT keyboard driver */
 
 #define BTN_MISC               0x100
@@ -503,6 +505,7 @@ struct input_keymap_entry {
 #define BTN_TOOL_FINGER                0x145
 #define BTN_TOOL_MOUSE         0x146
 #define BTN_TOOL_LENS          0x147
+#define BTN_TOOL_QUINTTAP      0x148   /* Five fingers on trackpad */
 #define BTN_TOUCH              0x14a
 #define BTN_STYLUS             0x14b
 #define BTN_STYLUS2            0x14c