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/netx-serial.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/netx-serial.c')
-rw-r--r-- | drivers/serial/netx-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c index 81ac9bb4f39..9f8ccb735c1 100644 --- a/drivers/serial/netx-serial.c +++ b/drivers/serial/netx-serial.c | |||
@@ -203,7 +203,7 @@ static void netx_txint(struct uart_port *port) | |||
203 | static void netx_rxint(struct uart_port *port) | 203 | static void netx_rxint(struct uart_port *port) |
204 | { | 204 | { |
205 | unsigned char rx, flg, status; | 205 | unsigned char rx, flg, status; |
206 | struct tty_struct *tty = port->info->tty; | 206 | struct tty_struct *tty = port->info->port.tty; |
207 | 207 | ||
208 | while (!(readl(port->membase + UART_FR) & FR_RXFE)) { | 208 | while (!(readl(port->membase + UART_FR) & FR_RXFE)) { |
209 | rx = readl(port->membase + UART_DR); | 209 | rx = readl(port->membase + UART_DR); |