diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-26 05:50:29 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-26 05:50:29 -0400 |
| commit | e8c2cd99a3933d93413910bc93cbd5b53177110b (patch) | |
| tree | ea4c1d63b1bdeb9ef1aacacad0ac9c7dc0768fdc /drivers/serial/clps711x.c | |
| parent | 5a8c0cc32bb6e029cd9c36f655c6b0955b0d9967 (diff) | |
| parent | 8ddec7460d2f5db3ac35812c03676b1473d1d668 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
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)) { |