From: Jeff Dike <jdike@addtoit.com>

The 'old' argument of tty_operations->set_termios changed from struct
termios to struct ktermios.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/um/drivers/line.c |    2 +-
 arch/um/include/line.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/um/drivers/line.c~tty-switch-to-ktermios-uml-fix arch/um/drivers/line.c
--- a/arch/um/drivers/line.c~tty-switch-to-ktermios-uml-fix
+++ a/arch/um/drivers/line.c
@@ -246,7 +246,7 @@ out_up:
 	return ret;
 }
 
-void line_set_termios(struct tty_struct *tty, struct termios * old)
+void line_set_termios(struct tty_struct *tty, struct ktermios * old)
 {
 	/* nothing */
 }
diff -puN arch/um/include/line.h~tty-switch-to-ktermios-uml-fix arch/um/include/line.h
--- a/arch/um/include/line.h~tty-switch-to-ktermios-uml-fix
+++ a/arch/um/include/line.h
@@ -76,7 +76,7 @@ extern int line_setup(struct line *lines
 extern int line_write(struct tty_struct *tty, const unsigned char *buf,
 		      int len);
 extern void line_put_char(struct tty_struct *tty, unsigned char ch);
-extern void line_set_termios(struct tty_struct *tty, struct termios * old);
+extern void line_set_termios(struct tty_struct *tty, struct ktermios * old);
 extern int line_chars_in_buffer(struct tty_struct *tty);
 extern void line_flush_buffer(struct tty_struct *tty);
 extern void line_flush_chars(struct tty_struct *tty);
_