diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-07-16 16:54:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-20 20:12:36 -0400 |
commit | a88487c79bfefb715030c5baa68fbedc1b8732e8 (patch) | |
tree | 1bf54afe3ec0a8aef77fc0e4ccc2c922a918ad98 /drivers/serial/ip22zilog.c | |
parent | b1ca7e7a0b35874b2a9cae60f8f5b78df575faa7 (diff) |
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>
Diffstat (limited to 'drivers/serial/ip22zilog.c')
-rw-r--r-- | drivers/serial/ip22zilog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c index 9c95bc0398ad..0d9acbd0bb70 100644 --- a/drivers/serial/ip22zilog.c +++ b/drivers/serial/ip22zilog.c | |||
@@ -257,8 +257,8 @@ static struct tty_struct *ip22zilog_receive_chars(struct uart_ip22zilog_port *up | |||
257 | 257 | ||
258 | tty = NULL; | 258 | tty = NULL; |
259 | if (up->port.info != NULL && | 259 | if (up->port.info != NULL && |
260 | up->port.info->tty != NULL) | 260 | up->port.info->port.tty != NULL) |
261 | tty = up->port.info->tty; | 261 | tty = up->port.info->port.tty; |
262 | 262 | ||
263 | for (;;) { | 263 | for (;;) { |
264 | ch = readb(&channel->control); | 264 | ch = readb(&channel->control); |