From 8391e8118bfd7d46d20ad562e1a8d7921f1befe1 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 Jul 2008 21:54:22 +0100
Subject: [PATCH] --- yaml --- r: 102357 b: refs/heads/master c:
 87c25ef0a41ad7a8249cd3009bf65deb700d4ee3 h: refs/heads/master i:   102355:
 441c1c03ff200e23121227f95e496bb3b45d87e7 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/serial/pmac_zilog.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 18eca6a79dbb..482b11bce04e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f7a697a13a189a7ef43a9b6bfc3fc6e359d96fb
+refs/heads/master: 87c25ef0a41ad7a8249cd3009bf65deb700d4ee3
diff --git a/trunk/drivers/serial/pmac_zilog.c b/trunk/drivers/serial/pmac_zilog.c
index 794bd0f50d73..317b061f7641 100644
--- a/trunk/drivers/serial/pmac_zilog.c
+++ b/trunk/drivers/serial/pmac_zilog.c
@@ -242,12 +242,12 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
 	}
 
 	/* Sanity check, make sure the old bug is no longer happening */
-	if (uap->port.info == NULL || uap->port.info->tty == NULL) {
+	if (uap->port.info == NULL || uap->port.info->port.tty == NULL) {
 		WARN_ON(1);
 		(void)read_zsdata(uap);
 		return NULL;
 	}
-	tty = uap->port.info->tty;
+	tty = uap->port.info->port.tty;
 
 	while (1) {
 		error = 0;