diff options
| author | Hector Martin <marcan@marcan.st> | 2021-04-08 19:17:19 +0900 |
|---|---|---|
| committer | Hector Martin <marcan@marcan.st> | 2021-04-08 19:17:33 +0900 |
| commit | fd3b2aa100fa879848ae28fd4cb6ff7bb682ae7d (patch) | |
| tree | d417b1a0b9db925fc791393bdfeee2099ef32028 /include/uapi/linux/serial.h | |
| parent | 1e28eed17697bcf343c6743f0028cc3b5dd88bf0 (diff) | |
| parent | 71b25f4df9849799d84d9345c636aac097316052 (diff) | |
Merge commit '71b25f4df984' from tty/tty-next
This point in gregkh's tty-next tree includes all the samsung_tty
changes that were part of v3 of the M1 bring-up series, and have
already been merged in.
Signed-off-by: Hector Martin <marcan@marcan.st>
Diffstat (limited to 'include/uapi/linux/serial.h')
| -rw-r--r-- | include/uapi/linux/serial.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h index 93eb3c496ff1..fa6b16e5fdd8 100644 --- a/include/uapi/linux/serial.h +++ b/include/uapi/linux/serial.h @@ -52,11 +52,11 @@ struct serial_struct { #define PORT_16450 2 #define PORT_16550 3 #define PORT_16550A 4 -#define PORT_CIRRUS 5 /* usurped by cyclades.c */ +#define PORT_CIRRUS 5 #define PORT_16650 6 #define PORT_16650V2 7 #define PORT_16750 8 -#define PORT_STARTECH 9 /* usurped by cyclades.c */ +#define PORT_STARTECH 9 #define PORT_16C950 10 /* Oxford Semiconductor */ #define PORT_16654 11 #define PORT_16850 12 |