Merge master.kernel.org:/home/rmk/linux-2.6-serial

5131bf5d · Linus Torvalds · 358c6ac0 · ff39bc77 · 5131bf5d
Commit 5131bf5d authored Jun 08, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/serial/sa1100.c drivers/serial/sa1100.c +1 -1

No files found.
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -197,7 +197,7 @@ static void
 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));