Merge branches 'armv7', 'at91', 'misc' and 'omap' into devel

[linux-2.6] / drivers / serial / 68360serial.c

diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index 4e56ec803861a5aaf3b58a8617a770ca4ea671a2..68817a7d8c0d46c7ea33e05e3a1eeac7013a7db8 100644 (file)
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -620,7 +620,7 @@ static void rs_360_interrupt(int vec, void *dev_id)
        volatile struct smc_regs *smcp;
        volatile struct scc_regs *sccp;
        
-       info = (ser_info_t *)dev_id;
+       info = dev_id;
 
        idx = PORT_NUM(info->state->smc_scc_num);
        if (info->state->smc_scc_num & NUM_IS_SCC) {
@@ -1523,7 +1523,7 @@ static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
 
 /* FIX UP modem control here someday......
 */
-static void rs_360_set_termios(struct tty_struct *tty, struct termios *old_termios)
+static void rs_360_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
        ser_info_t *info = (ser_info_t *)tty->driver_data;