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

This commit is contained in:
Linus Torvalds 2005-06-08 11:42:44 -07:00
commit 5131bf5db7

View file

@ -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));