diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-19 10:28:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-19 10:28:27 -0700 |
| commit | 240206fcab661afe9bed72e8704cef1d6e83e338 (patch) | |
| tree | 62b77b140e6ee1c54bcd862eacd2ecafeb9bb2df /Documentation | |
| parent | 6d906f99817951e2257d577656899da02bb33105 (diff) | |
| parent | bf2a7ca39fd3ab47ef71c621a7ee69d1813b1f97 (diff) | |
| download | linux-240206fcab661afe9bed72e8704cef1d6e83e338.tar.gz linux-240206fcab661afe9bed72e8704cef1d6e83e338.tar.bz2 linux-240206fcab661afe9bed72e8704cef1d6e83e338.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
- several new key mappings for HID
- a host of new ACPI IDs used to identify Elan touchpads in Lenovo
laptops
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: snvs_pwrkey - initialize necessary driver data before enabling IRQ
HID: input: add mapping for "Toggle Display" key
HID: input: add mapping for "Full Screen" key
HID: input: add mapping for keyboard Brightness Up/Down/Toggle keys
HID: input: add mapping for Expose/Overview key
HID: input: fix mapping of aspect ratio key
[media] doc-rst: switch to new names for Full Screen/Aspect keys
Input: document meanings of KEY_SCREEN and KEY_ZOOM
Input: elan_i2c - add hardware ID for multiple Lenovo laptops
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/media/uapi/rc/rc-tables.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/media/uapi/rc/rc-tables.rst b/Documentation/media/uapi/rc/rc-tables.rst index f460031d8531..177ac44fa0fa 100644 --- a/Documentation/media/uapi/rc/rc-tables.rst +++ b/Documentation/media/uapi/rc/rc-tables.rst @@ -623,7 +623,7 @@ the remote via /dev/input/event devices. - .. row 78 - - ``KEY_SCREEN`` + - ``KEY_ASPECT_RATIO`` - Select screen aspect ratio @@ -631,7 +631,7 @@ the remote via /dev/input/event devices. - .. row 79 - - ``KEY_ZOOM`` + - ``KEY_FULL_SCREEN`` - Put device into zoom/full screen mode |