Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd

[pandora-kernel.git] / drivers / serial / mux.c

diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c
index e940317..953a5ff 100644 (file)
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
@@ -243,7 +243,7 @@ static void mux_write(struct uart_port *port)
 static void mux_read(struct uart_port *port)
 {
        int data;
-       struct tty_struct *tty = port->info->tty;
+       struct tty_struct *tty = port->info->port.tty;
        __u32 start_count = port->icount.rx;
 
        while(1) {