diff options
| author | Greg Kroah-Hartman <[email protected]> | 2015-05-08 14:38:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2015-05-08 14:38:55 +0200 |
| commit | b4da00601edd39184fa187d5fd6dfc36232991cc (patch) | |
| tree | f58bafde4efd814bb78b4f531b1eab48dcf8e561 /include/linux/tty.h | |
| parent | d5a7d45fb5b667fd10a225ccf11fe395fb2417d9 (diff) | |
| parent | 5ebe6afaf0057ac3eaeb98defd5456894b446d22 (diff) | |
Merge 4.1-rc2 into staging-next
We want the fixes in here to make merges and testing easier.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 358a337af598..fe5623c9af71 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -491,6 +491,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_set_termios(struct tty_struct *tty, struct ktermios *kt); extern struct tty_ldisc *tty_ldisc_ref(struct tty_struct *); extern void tty_ldisc_deref(struct tty_ldisc *); |