diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
| commit | 7e66eaf14e19c032433be7c4df3c892fa2a5282f (patch) | |
| tree | 56b0d5f9d16eb18744e102f3f216715196cd62e6 /include/linux/input.h | |
| parent | d3654d7ef3adad0083525cfb6fe27be62cb83d0d (diff) | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| download | linux-7e66eaf14e19c032433be7c4df3c892fa2a5282f.tar.gz linux-7e66eaf14e19c032433be7c4df3c892fa2a5282f.tar.bz2 linux-7e66eaf14e19c032433be7c4df3c892fa2a5282f.zip | |
Merge commit 'v3.1-rc4' into next
Diffstat (limited to 'include/linux/input.h')
| -rw-r--r-- | include/linux/input.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 4de4b4661f84..57add325e7a8 100644 --- 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 |