aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 11:42:44 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 11:42:44 -0700
commit5131bf5db73529e972459060d8559f72e036fe53 (patch)
tree0037ac7e0cc8b3433301042cf40b3fdc10955d6b
parent358c6ac0dd4ffa5e44d59d4008a2627aa2f02b6f (diff)
parentff39bc772ad18d8c7f9334926053b718d7932de0 (diff)
downloadkernel_samsung_tuna-5131bf5db73529e972459060d8559f72e036fe53.zip
kernel_samsung_tuna-5131bf5db73529e972459060d8559f72e036fe53.tar.gz
kernel_samsung_tuna-5131bf5db73529e972459060d8559f72e036fe53.tar.bz2
Merge master.kernel.org:/home/rmk/linux-2.6-serial
-rw-r--r--drivers/serial/sa1100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 22565a6..98641c3 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -197,7 +197,7 @@ static void
sa1100_rx_chars(struct sa1100_port *sport, struct pt_regs *regs)
{
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)) |
UTSR0_TO_SM(UART_GET_UTSR0(sport));