Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[deliverable/linux.git] / drivers / serial / uartlite.c

diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index 83690653b78b2be5544bb701498534bdeefde56f..92eba893559d003189e680bdf7d17f2990300111 100644 (file)
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -214,8 +214,8 @@ static void ulite_shutdown(struct uart_port *port)
        free_irq(port->irq, port);
 }
 
-static void ulite_set_termios(struct uart_port *port, struct termios *termios,
-                             struct termios *old)
+static void ulite_set_termios(struct uart_port *port, struct ktermios *termios,
+                             struct ktermios *old)
 {
        unsigned long flags;
        unsigned int baud;