Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
  tty/of_serial: add missing ns16550a id
  bcm63xx_uart: Fix serial driver compile breakage.
  tty_port: handle the nonblocking open of a dead port corner case

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/serial/bcm63xx_uart.c b/drivers/serial/bcm63xx_uart.c
index beddaa6e9069..37ad0c449937 100644
--- a/drivers/serial/bcm63xx_uart.c
+++ b/drivers/serial/bcm63xx_uart.c
@@ -242,7 +242,7 @@ static void bcm_uart_do_rx(struct uart_port *port)
          * higher than fifo size anyway since we're much faster than
          * serial port */
         max_count = 32;
-        tty = port->info->port.tty;
+        tty = port->state->port.tty;
         do {
                 unsigned int iestat, c, cstat;
                 char flag;
@@ -318,7 +318,7 @@ static void bcm_uart_do_tx(struct uart_port *port)
                 return;
         }
 
-        xmit = &port->info->xmit;
+        xmit = &port->state->xmit;
         if (uart_circ_empty(xmit))
                 goto txq_empty;