diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-07-16 22:54:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 02:12:36 +0200 |
| commit | a88487c79bfefb715030c5baa68fbedc1b8732e8 (patch) | |
| tree | 1bf54afe3ec0a8aef77fc0e4ccc2c922a918ad98 /drivers/serial/21285.c | |
| parent | - Fix compile errors in SGI console drivers (linux-next tree) (diff) | |
| download | linux-a88487c79bfefb715030c5baa68fbedc1b8732e8.tar.xz linux-a88487c79bfefb715030c5baa68fbedc1b8732e8.zip | |
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/21285.c')
| -rw-r--r-- | drivers/serial/21285.c | 6 |
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); } |