Fix compile errors in SGI console drivers (linux-next tree)

The below is the patch to replace blindly all possible places,
including Jack's fixes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
(Reviewed and checked rather than blindly added)
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 1b6b83cf7a40..6558a4037806 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -86,7 +86,7 @@ static void serial21285_enable_ms(struct uart_port *port)
 static irqreturn_t serial21285_rx_chars(int irq, void *dev_id)
 {
         struct uart_port *port = dev_id;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         unsigned int status, ch, flag, rxs, max_count = 256;
 
         status = *CSR_UARTFLG;
@@ -235,8 +235,8 @@ serial21285_set_termios(struct uart_port *port, struct ktermios *termios,
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); 
         quot = uart_get_divisor(port, baud);
 
-        if (port->info && port->info->tty) {
-                struct tty_struct *tty = port->info->tty;
+        if (port->info && port->info->port.tty) {
+                struct tty_struct *tty = port->info->port.tty;
                 unsigned int b = port->uartclk / (16 * quot);
                 tty_encode_baud_rate(tty, b, b);
         }