diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-24 16:49:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-24 16:49:37 -0400 |
| commit | 2e55b57a6000ff05f6aadcddf204ecb42749a332 (patch) | |
| tree | 24ffdb922b0e20300dd13cb2eb4d7f68048ac1a3 | |
| parent | f50c02831d833a27321388bc595a3c376ae941e4 (diff) | |
| parent | f993724210744a9b07cf5496808828c4da6ab6df (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -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)) { |