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

+1 -1
+1 -1
drivers/serial/clps711x.c
··· 98 98 { 99 99 struct uart_port *port = dev_id; 100 100 struct tty_struct *tty = port->info->tty; 101 - unsigned int status, ch, flg, ignored = 0; 101 + unsigned int status, ch, flg; 102 102 103 103 status = clps_readl(SYSFLG(port)); 104 104 while (!(status & SYSFLG_URXFE)) {