diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-28 10:18:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-28 10:18:33 -0700 |
| commit | 572782b213b284e05cbbe941a18df055d8d1d898 (patch) | |
| tree | d86162a49c5b48833c9c5fc1b976f627bbf514e7 /include/uapi | |
| parent | ad28fd1cb2bd7d67f9240f596ea4740c95545fdf (diff) | |
| parent | 61d51456f35760a09e8aa1e6ddd247f1547015d3 (diff) | |
| download | lwn-572782b213b284e05cbbe941a18df055d8d1d898.tar.gz lwn-572782b213b284e05cbbe941a18df055d8d1d898.zip | |
Merge tag 'tty-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty fixes from Greg KH:
"Here are two tty/vt fixes:
- delete the netx-serial driver as the arch has been removed, no need
to keep the serial driver for it around either.
- vt console_lock fix to resolve a reported noisy warning at runtime
Both of these have been in linux-next with no reported issues"
* tag 'tty-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
vt: Grab console_lock around con_is_bound in show_bind
tty: serial: netx: Delete driver
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/serial_core.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h index 5642c05e0da0..3cc3af1c2ee1 100644 --- a/include/uapi/linux/serial_core.h +++ b/include/uapi/linux/serial_core.h @@ -150,9 +150,6 @@ #define PORT_PNX8XXX 70 -/* Hilscher netx */ -#define PORT_NETX 71 - /* SUN4V Hypervisor Console */ #define PORT_SUNHV 72 |