diff --git a/[refs] b/[refs] index 0b430a44d97c..7f5f41c45004 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b52dd0077cde89111c00efc73a8db07f50ebb3e8 +refs/heads/master: f3c7f317c91e45aac0ef9d0b6474cd4637de69f0 diff --git a/trunk/drivers/char/serial167.c b/trunk/drivers/char/serial167.c index 8dfd24721a82..78a62ebe75c7 100644 --- a/trunk/drivers/char/serial167.c +++ b/trunk/drivers/char/serial167.c @@ -627,7 +627,6 @@ static irqreturn_t cd2401_rx_interrupt(int irq, void *dev_id) char data; int char_count; int save_cnt; - int len; /* determine the channel and change to that context */ channel = (u_short) (base_addr[CyLICR] >> 2); @@ -1528,7 +1527,6 @@ static int cy_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) { - unsigned long val; struct cyclades_port *info = tty->driver_data; int ret_val = 0; void __user *argp = (void __user *)arg;