Merge branch 'linus' into tmp.x86.mpparse.new

[linux-2.6-omap-h63xx.git] / drivers / serial / clps711x.c

diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 598012714882751888ede1f3dda4f11941c94680..23827189ec0e7891645d36fac7e933be6acadadf 100644 (file)
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -286,8 +286,8 @@ static void clps711xuart_shutdown(struct uart_port *port)
 }
 
 static void
-clps711xuart_set_termios(struct uart_port *port, struct termios *termios,
-                        struct termios *old)
+clps711xuart_set_termios(struct uart_port *port, struct ktermios *termios,
+                        struct ktermios *old)
 {
        unsigned int ubrlcr, baud, quot;
        unsigned long flags;