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

2e55b57a · Linus Torvalds · f50c0283 · f9937242 · 2e55b57a
Commit 2e55b57a authored Sep 24, 2005 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -98,7 +98,7 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re
 {
 	struct uart_port *port = dev_id;
 	struct tty_struct *tty = port->info->tty;
-	unsigned int status, ch, flg, ignored = 0;
+	unsigned int status, ch, flg;

 	status = clps_readl(SYSFLG(port));
 	while (!(status & SYSFLG_URXFE)) {