Merge master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / serial / mux.c

diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index ea9cbda..8321101 100644 (file)
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -307,8 +307,8 @@ static void mux_shutdown(struct uart_port *port)
  * The Serial Mux does not support this function.
  */
 static void
-mux_set_termios(struct uart_port *port, struct termios *termios,
-               struct termios *old)
+mux_set_termios(struct uart_port *port, struct ktermios *termios,
+               struct ktermios *old)
 {
 }