diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 14:42:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 14:42:44 -0400 |
| commit | 5131bf5db73529e972459060d8559f72e036fe53 (patch) | |
| tree | 0037ac7e0cc8b3433301042cf40b3fdc10955d6b | |
| parent | 358c6ac0dd4ffa5e44d59d4008a2627aa2f02b6f (diff) | |
| parent | ff39bc772ad18d8c7f9334926053b718d7932de0 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/serial/sa1100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index 22565a67a57c..98641c3f5ab9 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c | |||
| @@ -197,7 +197,7 @@ static void | |||
| 197 | sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs) | 197 | sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs) |
| 198 | { | 198 | { |
| 199 | struct tty_struct *tty = sport->port.info->tty; | 199 | struct tty_struct *tty = sport->port.info->tty; |
| 200 | unsigned int status, ch, flg, ignored = 0; | 200 | unsigned int status, ch, flg; |
| 201 | 201 | ||
| 202 | status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) | | 202 | status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) | |
| 203 | UTSR0_TO_SM(UART_GET_UTSR0(sport)); | 203 | UTSR0_TO_SM(UART_GET_UTSR0(sport)); |