diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-14 18:59:17 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-14 18:59:17 +1000 |
| commit | 408f5118e76cc67d033d3a5ca89a082bd4bc7bef (patch) | |
| tree | df4dc225da095a09c90e53febdeee851a4ede879 /drivers | |
| parent | b03b14c891cada08b766d5a4af85b17bc427d8b4 (diff) | |
09-tty-ppc-fix-zilog
Hi Alan,
Today's linux-next build (powerpc allyesconfig) failed like this:
drivers/serial/pmac_zilog.c: In function 'pmz_receive_chars':
drivers/serial/pmac_zilog.c:245: error: 'struct uart_info' has no member named 'tty'
drivers/serial/pmac_zilog.c:250: error: 'struct uart_info' has no member named 'tty'
I applied the patch below (which builds but may, or may not, be correct).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/pmac_zilog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index 794bd0f50d73..317b061f7641 100644 --- a/drivers/serial/pmac_zilog.c +++ b/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; |