From: Andrew Morton Cc: Alan Cox Signed-off-by: Andrew Morton --- include/net/irda/ircomm_tty.h | 2 +- net/irda/ircomm/ircomm_tty_ioctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN net/irda/ircomm/ircomm_tty.c~tty-switch-to-ktermios-and-new-framework-irda-fix net/irda/ircomm/ircomm_tty.c diff -puN net/irda/ircomm/ircomm_tty_ioctl.c~tty-switch-to-ktermios-and-new-framework-irda-fix net/irda/ircomm/ircomm_tty_ioctl.c --- a/net/irda/ircomm/ircomm_tty_ioctl.c~tty-switch-to-ktermios-and-new-framework-irda-fix +++ a/net/irda/ircomm/ircomm_tty_ioctl.c @@ -146,7 +146,7 @@ static void ircomm_tty_change_speed(stru * do something rational. */ void ircomm_tty_set_termios(struct tty_struct *tty, - struct termios *old_termios) + struct ktermios *old_termios) { struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; unsigned int cflag = tty->termios->c_cflag; diff -puN include/net/irda/ircomm_tty.h~tty-switch-to-ktermios-and-new-framework-irda-fix include/net/irda/ircomm_tty.h --- a/include/net/irda/ircomm_tty.h~tty-switch-to-ktermios-and-new-framework-irda-fix +++ a/include/net/irda/ircomm_tty.h @@ -126,7 +126,7 @@ extern int ircomm_tty_tiocmset(struct tt extern int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); extern void ircomm_tty_set_termios(struct tty_struct *tty, - struct termios *old_termios); + struct ktermios *old_termios); extern hashbin_t *ircomm_tty; #endif _