Skip to content

L
linux-davinci-2.6.23
Commit 5131bf5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents 358c6ac0 ff39bc77
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/serial/sa1100.c
View file @ 5131bf5d
...@@ -197,7 +197,7 @@ static void ...@@ -197,7 +197,7 @@ static void
sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs) sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs)
{ {
struct tty_struct *tty = sport->port.info->tty; struct tty_struct *tty = sport->port.info->tty;
unsigned int status, ch, flg, ignored = 0; unsigned int status, ch, flg;
status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) | status = UTSR1_TO_SM(UART_GET_UTSR1(sport)) |
UTSR0_TO_SM(UART_GET_UTSR0(sport)); UTSR0_TO_SM(UART_GET_UTSR0(sport));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment