commit | 5131bf5db73529e972459060d8559f72e036fe53 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@ppc970.osdl.org> | Wed Jun 08 11:42:44 2005 -0700 |
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | Wed Jun 08 11:42:44 2005 -0700 |
tree | 0037ac7e0cc8b3433301042cf40b3fdc10955d6b | |
parent | 358c6ac0dd4ffa5e44d59d4008a2627aa2f02b6f [diff] | |
parent | ff39bc772ad18d8c7f9334926053b718d7932de0 [diff] |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index 22565a6..98641c3 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c
@@ -197,7 +197,7 @@ sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs) { struct tty_struct *tty = sport->port.info->tty; - unsigned int status, ch, flg, ignored = 0; + unsigned int status, ch, flg; status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) | UTSR0_TO_SM(UART_GET_UTSR0(sport));