aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/sa1100.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/sa1100.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/sa1100.c')
-rw-r--r--drivers/serial/sa1100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index f3cf7fe40fa9..a5e76cc18073 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -189,7 +189,7 @@ static void sa1100_enable_ms(struct uart_port *port)
189static void 189static void
190sa1100_rx_chars(struct sa1100_port *sport) 190sa1100_rx_chars(struct sa1100_port *sport)
191{ 191{
192 struct tty_struct *tty = sport->port.info->tty; 192 struct tty_struct *tty = sport->port.info->port.tty;
193 unsigned int status, ch, flg; 193 unsigned int status, ch, flg;
194 194
195 status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) | 195 status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |