aboutsummaryrefslogtreecommitdiff
path: root/drivers/serial/icom.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-02 00:53:36 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-02 00:53:36 -0700
commit138307b475286a5bcc985b06b3e71fcd33dd5e2c (patch)
treee025c7cb26396b07f157eea20a1cfb037b66758f /drivers/serial/icom.c
parent66f3767376e2bbffb4c2c78ea171e1fdcb62201b (diff)
parentbc49a661e6e82bfa8219c3d0a2e4dea51c847d23 (diff)
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial/icom.c')
-rw-r--r--drivers/serial/icom.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index c112b32764e..79f8df4d66b 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -989,18 +989,16 @@ static unsigned int icom_get_mctrl(struct uart_port *port)
return result;
}
-static void icom_stop_tx(struct uart_port *port, unsigned int tty_stop)
+static void icom_stop_tx(struct uart_port *port)
{
unsigned char cmdReg;
- if (tty_stop) {
- trace(ICOM_PORT, "STOP", 0);
- cmdReg = readb(&ICOM_PORT->dram->CmdReg);
- writeb(cmdReg | CMD_HOLD_XMIT, &ICOM_PORT->dram->CmdReg);
- }
+ trace(ICOM_PORT, "STOP", 0);
+ cmdReg = readb(&ICOM_PORT->dram->CmdReg);
+ writeb(cmdReg | CMD_HOLD_XMIT, &ICOM_PORT->dram->CmdReg);
}
-static void icom_start_tx(struct uart_port *port, unsigned int tty_start)
+static void icom_start_tx(struct uart_port *port)
{
unsigned char cmdReg;