diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 19:46:45 -0400 |
| commit | 2b235826098bb653982894dfc3f70fd029f6c2e4 (patch) | |
| tree | ec525ddba74f58017a3f145bb68cf94376648c1c /drivers/serial/clps711x.c | |
| parent | b4b52db71529bbe46da914eda772fb574914c94d (diff) | |
| parent | c77054e518d9163578cfcad09826d7b959f95ece (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/serial/clps711x.c')
| -rw-r--r-- | drivers/serial/clps711x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index 78c1f36ad9b7..87ef368384fb 100644 --- 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 | |||
| 98 | { | 98 | { |
| 99 | struct uart_port *port = dev_id; | 99 | struct uart_port *port = dev_id; |
| 100 | struct tty_struct *tty = port->info->tty; | 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 | status = clps_readl(SYSFLG(port)); | 103 | status = clps_readl(SYSFLG(port)); |
| 104 | while (!(status & SYSFLG_URXFE)) { | 104 | while (!(status & SYSFLG_URXFE)) { |