aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/amba-pl011.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-07-16 16:54:42 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 20:12:36 -0400
commita88487c79bfefb715030c5baa68fbedc1b8732e8 (patch)
tree1bf54afe3ec0a8aef77fc0e4ccc2c922a918ad98 /drivers/serial/amba-pl011.c
parentb1ca7e7a0b35874b2a9cae60f8f5b78df575faa7 (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/amba-pl011.c')
-rw-r--r--drivers/serial/amba-pl011.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c
index 8b5aa0ba2aa1..9d08f27208a1 100644
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
@@ -107,7 +107,7 @@ static void pl011_enable_ms(struct uart_port *port)
107 107
108static void pl011_rx_chars(struct uart_amba_port *uap) 108static void pl011_rx_chars(struct uart_amba_port *uap)
109{ 109{
110 struct tty_struct *tty = uap->port.info->tty; 110 struct tty_struct *tty = uap->port.info->port.tty;
111 unsigned int status, ch, flag, max_count = 256; 111 unsigned int status, ch, flag, max_count = 256;
112 112
113 status = readw(uap->port.membase + UART01x_FR); 113 status = readw(uap->port.membase + UART01x_FR);