diff --git a/[refs] b/[refs] index 8223a8c66d42..3a20622984b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2ee4ae87d7781ddb5bf8da25591b9b79966f8ea +refs/heads/master: 9d86f71b599a3f59bc9fe7eabf6c84c8c3a37fe0 diff --git a/trunk/drivers/tty/moxa.c b/trunk/drivers/tty/moxa.c index 35b0c38590e6..ffdaab393144 100644 --- a/trunk/drivers/tty/moxa.c +++ b/trunk/drivers/tty/moxa.c @@ -1281,10 +1281,8 @@ static int moxa_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear) { struct moxa_port *ch; - int port; int dtr, rts; - port = tty->index; mutex_lock(&moxa_openlock); ch = tty->driver_data; if (!ch) { @@ -1756,11 +1754,9 @@ static int MoxaPortSetTermio(struct moxa_port *port, struct ktermios *termio, speed_t baud) { void __iomem *ofsAddr; - tcflag_t cflag; tcflag_t mode = 0; ofsAddr = port->tableAddr; - cflag = termio->c_cflag; /* termio->c_cflag */ mode = termio->c_cflag & CSIZE; if (mode == CS5)