4 files changed, 5 insertions, 5 deletions

diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 2847336742d7..aeeec5588afd 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -185,7 +185,7 @@ static struct tty_struct *receive_chars(struct uart_port *port)
         struct tty_struct *tty = NULL;
 
         if (port->info != NULL)         /* Unopened serial console */
-                tty = port->info->tty;
+                tty = port->info->port.tty;
 
         if (sunhv_ops->receive_chars(port, tty))
                 sun_do_break();
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index 9ff5b38f3bee..15ee497e1c78 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -118,7 +118,7 @@ receive_chars(struct uart_sunsab_port *up,
         int i;
 
         if (up->port.info != NULL)              /* Unopened serial console */
-                tty = up->port.info->tty;
+                tty = up->port.info->port.tty;
 
         /* Read number of BYTES (Character + Status) available. */
         if (stat->sreg.isr0 & SAB82532_ISR0_RPF) {
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 1074e73d7433..e24e68235088 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -311,7 +311,7 @@ static void sunsu_enable_ms(struct uart_port *port)
 static struct tty_struct *
 receive_chars(struct uart_sunsu_port *up, unsigned char *status)
 {
-        struct tty_struct *tty = up->port.info->tty;
+        struct tty_struct *tty = up->port.info->port.tty;
         unsigned char ch, flag;
         int max_count = 256;
         int saw_console_brk = 0;
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 7e9fa5ef0eb7..0f3d69b86d67 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -329,8 +329,8 @@ sunzilog_receive_chars(struct uart_sunzilog_port *up,
 
         tty = NULL;
         if (up->port.info != NULL &&            /* Unopened serial console */
-            up->port.info->tty != NULL)         /* Keyboard || mouse */
-                tty = up->port.info->tty;
+            up->port.info->port.tty != NULL)    /* Keyboard || mouse */
+                tty = up->port.info->port.tty;
 
         for (;;) {