diff options
author | Mark Brown <broonie@kernel.org> | 2023-05-23 23:03:49 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-05-23 23:03:49 +0100 |
commit | 90d0d6009c0f6b0693ac58096c655a2df61e0d50 (patch) | |
tree | b076f02b48dc57f295981e27965bb28e571b5cbc /drivers/tty/serial/8250/8250_port.c | |
parent | 53632462666c378774f7665960f0ab67ac22f77a (diff) | |
parent | 44c026a73be8038f03dbdeef028b642880cf1511 (diff) |
regmap: Merge up v6.4-rc3
Merge up v6.4-rc3 to get fixes which make my CI more stable.
Diffstat (limited to 'drivers/tty/serial/8250/8250_port.c')
-rw-r--r-- | drivers/tty/serial/8250/8250_port.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index fe8d79c4ae95..c153ba3a018a 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -669,6 +669,7 @@ EXPORT_SYMBOL_GPL(serial8250_em485_supported); /** * serial8250_em485_config() - generic ->rs485_config() callback * @port: uart port + * @termios: termios structure * @rs485: rs485 settings * * Generic callback usable by 8250 uart drivers to activate rs485 settings |