diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-18 13:50:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-18 13:50:41 -0400 |
| commit | 336722eb9d9732c5a497fb6299bf38cde413592b (patch) | |
| tree | 3b547c3bb7ec0d6dcc8d915e6b76a4f12e2f7bff /include/uapi/linux | |
| parent | 5695d5d1970f975de059bb6dec76941440f62488 (diff) | |
| parent | 47ac76662ca9c5852fd353093f19de3ae85f2e66 (diff) | |
Merge tag 'tty-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver updates from Greg KH:
"Here is the big tty and serial driver pull request for 4.19-rc1.
It's not all that big, just a number of small serial driver updates
and fixes, along with some better vt handling for unicode characters
for those using braille terminals.
All of these patches have been in linux-next for a long time with no
reported issues"
* tag 'tty-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (73 commits)
tty: serial: 8250: Revert NXP SC16C2552 workaround
serial: 8250_exar: Read INT0 from slave device, too
tty: rocket: Fix possible buffer overwrite on register_PCI
serial: 8250_dw: Add ACPI support for uart on Broadcom SoC
serial: 8250_dw: always set baud rate in dw8250_set_termios
dt-bindings: serial: Add binding for uartlite
tty: serial: uartlite: Add support for suspend and resume
tty: serial: uartlite: Add clock adaptation
tty: serial: uartlite: Add structure for private data
serial: sh-sci: Improve support for separate TEI and DRI interrupts
serial: sh-sci: Remove SCIx_RZ_SCIFA_REGTYPE
serial: sh-sci: Allow for compressed SCIF address
serial: sh-sci: Improve interrupts description
serial: 8250: Use cached port name directly in messages
serial: 8250_exar: Drop unused variable in pci_xr17v35x_setup()
vt: drop unused struct vt_struct
vt: avoid a VLA in the unicode screen scroll function
vt: add /dev/vcsu* to devices.txt
vt: coherence validation code for the unicode screen buffer
vt: selection: take screen contents from uniscr if available
...
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/keyboard.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/include/uapi/linux/keyboard.h b/include/uapi/linux/keyboard.h index ab4108c83186..4846716e7c5c 100644 --- a/include/uapi/linux/keyboard.h +++ b/include/uapi/linux/keyboard.h | |||
| @@ -357,8 +357,29 @@ | |||
| 357 | #define K_DTILDE K(KT_DEAD,3) | 357 | #define K_DTILDE K(KT_DEAD,3) |
| 358 | #define K_DDIERE K(KT_DEAD,4) | 358 | #define K_DDIERE K(KT_DEAD,4) |
| 359 | #define K_DCEDIL K(KT_DEAD,5) | 359 | #define K_DCEDIL K(KT_DEAD,5) |
| 360 | #define K_DMACRON K(KT_DEAD,6) | ||
| 361 | #define K_DBREVE K(KT_DEAD,7) | ||
| 362 | #define K_DABDOT K(KT_DEAD,8) | ||
| 363 | #define K_DABRING K(KT_DEAD,9) | ||
| 364 | #define K_DDBACUTE K(KT_DEAD,10) | ||
| 365 | #define K_DCARON K(KT_DEAD,11) | ||
| 366 | #define K_DOGONEK K(KT_DEAD,12) | ||
| 367 | #define K_DIOTA K(KT_DEAD,13) | ||
| 368 | #define K_DVOICED K(KT_DEAD,14) | ||
| 369 | #define K_DSEMVOICED K(KT_DEAD,15) | ||
| 370 | #define K_DBEDOT K(KT_DEAD,16) | ||
| 371 | #define K_DHOOK K(KT_DEAD,17) | ||
| 372 | #define K_DHORN K(KT_DEAD,18) | ||
| 373 | #define K_DSTROKE K(KT_DEAD,19) | ||
| 374 | #define K_DABCOMMA K(KT_DEAD,20) | ||
| 375 | #define K_DABREVCOMMA K(KT_DEAD,21) | ||
| 376 | #define K_DDBGRAVE K(KT_DEAD,22) | ||
| 377 | #define K_DINVBREVE K(KT_DEAD,23) | ||
| 378 | #define K_DBECOMMA K(KT_DEAD,24) | ||
| 379 | #define K_DCURRENCY K(KT_DEAD,25) | ||
| 380 | #define K_DGREEK K(KT_DEAD,26) | ||
| 360 | 381 | ||
| 361 | #define NR_DEAD 6 | 382 | #define NR_DEAD 27 |
| 362 | 383 | ||
| 363 | #define K_DOWN K(KT_CUR,0) | 384 | #define K_DOWN K(KT_CUR,0) |
| 364 | #define K_LEFT K(KT_CUR,1) | 385 | #define K_LEFT K(KT_CUR,1) |
