diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 16:26:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 16:26:15 -0400 |
| commit | 2560540b78b48c8050f56e8ff5903c11a4f7a16e (patch) | |
| tree | fca860f19ef6845e0d61dad8d8e3648c059b4ecd /include/linux | |
| parent | 45a05f9488911851f7a5c536df80b41f0105caf0 (diff) | |
| parent | 15b956a0b5651bbb1217ec374fdd67291dabb2af (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (38 commits)
acer-wmi: support Lenovo ideapad S205 wifi switch
acerhdf.c: spaces in aliased changed to *
platform-drivers-x86: ideapad-laptop: add missing ideapad_input_exit in ideapad_acpi_add error path
x86 driver: fix typo in TDP override enabling
Platform: fix samsung-laptop DMI identification for N150/N210/220/N230
dell-wmi: Add keys for Dell XPS L502X
platform-drivers-x86: samsung-q10: make dmi_check_callback return 1
Platform: Samsung Q10 backlight driver
platform-drivers-x86: intel_scu_ipc: convert to DEFINE_PCI_DEVICE_TABLE
platform-drivers-x86: intel_rar_register: convert to DEFINE_PCI_DEVICE_TABLE
platform-drivers-x86: intel_menlow: add missing return AE_OK for intel_menlow_register_sensor()
platform-drivers-x86: intel_mid_thermal: fix memory leak
platform-drivers-x86: msi-wmi: add missing sparse_keymap_free in msi_wmi_init error path
Samsung Laptop platform driver: support N510
asus-wmi: add uwb rfkill support
asus-wmi: add gps rfkill support
asus-wmi: add CWAP support and clarify the meaning of WAPF bits
asus-wmi: return proper value in store_cpufv()
asus-wmi: check for temp1 presence
asus-wmi: add thermal sensor
...
Diffstat (limited to 'include/linux')
| -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 068784e17972..a637e7814334 100644 --- a/include/linux/input.h +++ b/include/linux/input.h | |||
| @@ -438,6 +438,8 @@ struct input_keymap_entry { | |||
| 438 | #define KEY_WIMAX 246 | 438 | #define KEY_WIMAX 246 |
| 439 | #define KEY_RFKILL 247 /* Key that controls all radios */ | 439 | #define KEY_RFKILL 247 /* Key that controls all radios */ |
| 440 | 440 | ||
| 441 | #define KEY_MICMUTE 248 /* Mute / unmute the microphone */ | ||
| 442 | |||
| 441 | /* Code 255 is reserved for special needs of AT keyboard driver */ | 443 | /* Code 255 is reserved for special needs of AT keyboard driver */ |
| 442 | 444 | ||
| 443 | #define BTN_MISC 0x100 | 445 | #define BTN_MISC 0x100 |