summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-31 12:15:20 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-31 12:15:20 +0200
commit7eeb11190f44bb1a5d1098b6ae0451690359dff2 (patch)
treeddd9ade9a4a9c0b3ed0172f54a472343fd91b869 /include/linux
parent2c093cdb0a5e62d3303a759f4330e62b3e2f82ed (diff)
parent7041d9c3f01b365daa50340a5d2dce84a09ea813 (diff)
downloadlinux-7eeb11190f44bb1a5d1098b6ae0451690359dff2.tar.gz
linux-7eeb11190f44bb1a5d1098b6ae0451690359dff2.tar.bz2
linux-7eeb11190f44bb1a5d1098b6ae0451690359dff2.zip
Merge tag 'usb-serial-4.18-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes: USB-serial updates for v4.18-rc1 Here are the USB-serial updates for 4.18-rc1, including: - support for hardware-assisted XON/XOFF output flow control for pl2303 - fix for a long-standing IXON/IXOFF mixup in ftdi_sio - blacklist of two apparently unused dwm-158 modem interfaces that confused some user space daemon (option) - add missing const to a tty helper currently used by USB serial only Included are also various clean ups. All have been in linux-next with no reported issues. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/tty.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 1dd587ba6d88..955cd0c93d84 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -527,7 +527,7 @@ static inline speed_t tty_get_baud_rate(struct tty_struct *tty)
}
extern void tty_termios_copy_hw(struct ktermios *new, struct ktermios *old);
-extern int tty_termios_hw_change(struct ktermios *a, struct ktermios *b);
+extern int tty_termios_hw_change(const struct ktermios *a, const struct ktermios *b);
extern int tty_set_termios(struct tty_struct *tty, struct ktermios *kt);
extern struct tty_ldisc *tty_ldisc_ref(struct tty_struct *);