diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-23 11:43:40 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-23 11:43:40 -0700 |
commit | 91de76e661a266731fc2889a398ad1694df9d523 (patch) | |
tree | ecc278f000f18e5b2b880f61ee4b0e68ebd1d6d4 /drivers/tty/serial/apbuart.c | |
parent | Input: edt-ft5x06 - implement support for the EDT-M12 series (diff) | |
parent | Linux 4.14-rc6 (diff) | |
download | linux-dev-91de76e661a266731fc2889a398ad1694df9d523.tar.xz linux-dev-91de76e661a266731fc2889a398ad1694df9d523.zip |
Merge tag 'v4.14-rc6' into next
Merge with mainline to bring in the timer API changes.
Diffstat (limited to 'drivers/tty/serial/apbuart.c')
-rw-r--r-- | drivers/tty/serial/apbuart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c index 75eb083b3361..dd60ed96a0ad 100644 --- a/drivers/tty/serial/apbuart.c +++ b/drivers/tty/serial/apbuart.c @@ -325,7 +325,7 @@ static int apbuart_verify_port(struct uart_port *port, return ret; } -static struct uart_ops grlib_apbuart_ops = { +static const struct uart_ops grlib_apbuart_ops = { .tx_empty = apbuart_tx_empty, .set_mctrl = apbuart_set_mctrl, .get_mctrl = apbuart_get_mctrl, |