diff -Naur -X linux-2.6.32-rc3-driver-core/Documentation/dontdiff linux-2.6.32-rc3-driver-core/arch/xtensa/platforms/iss/console.c linux-2.6.32-rc3-tty/arch/xtensa/platforms/iss/console.c --- linux-2.6.32-rc3-driver-core/arch/xtensa/platforms/iss/console.c 2009-10-05 16:43:42.000000000 -0700 +++ linux-2.6.32-rc3-tty/arch/xtensa/platforms/iss/console.c 2009-10-09 15:57:03.000000000 -0700 @@ -196,7 +196,7 @@ .release = single_release, }; -static struct tty_operations serial_ops = { +static const struct tty_operations serial_ops = { .open = rs_open, .close = rs_close, .write = rs_write, diff -Naur -X linux-2.6.32-rc3-driver-core/Documentation/dontdiff linux-2.6.32-rc3-driver-core/drivers/char/bfin_jtag_comm.c linux-2.6.32-rc3-tty/drivers/char/bfin_jtag_comm.c --- linux-2.6.32-rc3-driver-core/drivers/char/bfin_jtag_comm.c 2009-10-05 16:45:07.000000000 -0700 +++ linux-2.6.32-rc3-tty/drivers/char/bfin_jtag_comm.c 2009-10-09 15:57:03.000000000 -0700 @@ -226,7 +226,7 @@ } } -static struct tty_operations bfin_jc_ops = { +static const struct tty_operations bfin_jc_ops = { .open = bfin_jc_open, .close = bfin_jc_close, .write = bfin_jc_write, diff -Naur -X linux-2.6.32-rc3-driver-core/Documentation/dontdiff linux-2.6.32-rc3-driver-core/drivers/char/epca.c linux-2.6.32-rc3-tty/drivers/char/epca.c --- linux-2.6.32-rc3-driver-core/drivers/char/epca.c 2009-10-05 16:46:43.000000000 -0700 +++ linux-2.6.32-rc3-tty/drivers/char/epca.c 2009-10-09 15:57:04.000000000 -0700 @@ -934,7 +934,7 @@ return 0; } -static struct tty_operations info_ops = { +static const struct tty_operations info_ops = { .open = info_open, .ioctl = info_ioctl, }; diff -Naur -X linux-2.6.32-rc3-driver-core/Documentation/dontdiff linux-2.6.32-rc3-driver-core/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32-rc3-tty/drivers/char/pcmcia/ipwireless/tty.c --- linux-2.6.32-rc3-driver-core/drivers/char/pcmcia/ipwireless/tty.c 2009-10-05 16:45:08.000000000 -0700 +++ linux-2.6.32-rc3-tty/drivers/char/pcmcia/ipwireless/tty.c 2009-10-09 15:57:04.000000000 -0700 @@ -603,7 +603,7 @@ } } -static struct tty_operations tty_ops = { +static const struct tty_operations tty_ops = { .open = ipw_open, .close = ipw_close, .hangup = ipw_hangup, diff -Naur -X linux-2.6.32-rc3-driver-core/Documentation/dontdiff linux-2.6.32-rc3-driver-core/drivers/serial/jsm/jsm_driver.c linux-2.6.32-rc3-tty/drivers/serial/jsm/jsm_driver.c --- linux-2.6.32-rc3-driver-core/drivers/serial/jsm/jsm_driver.c 2009-10-05 16:43:55.000000000 -0700 +++ linux-2.6.32-rc3-tty/drivers/serial/jsm/jsm_driver.c 2009-10-09 15:57:02.000000000 -0700 @@ -123,7 +123,7 @@ } rc = request_irq(brd->irq, brd->bd_ops->intr, - IRQF_DISABLED|IRQF_SHARED, "JSM", brd); + IRQF_SHARED, "JSM", brd); if (rc) { printk(KERN_WARNING "Failed to hook IRQ %d\n",brd->irq); goto out_iounmap; diff -Naur -X linux-2.6.32-rc3-driver-core/Documentation/dontdiff linux-2.6.32-rc3-driver-core/drivers/serial/jsm/jsm.h linux-2.6.32-rc3-tty/drivers/serial/jsm/jsm.h --- linux-2.6.32-rc3-driver-core/drivers/serial/jsm/jsm.h 2009-10-05 16:45:22.000000000 -0700 +++ linux-2.6.32-rc3-tty/drivers/serial/jsm/jsm.h 2009-10-09 15:57:02.000000000 -0700 @@ -138,7 +138,6 @@ u32 nasync; /* Number of ports on card */ u32 irq; /* Interrupt request number */ - u64 intr_count; /* Count of interrupts */ u64 membase; /* Start of base memory of the card */ u64 membase_end; /* End of base memory of the card */ @@ -206,8 +205,6 @@ u64 ch_close_delay; /* How long we should drop RTS/DTR for */ - u64 ch_cpstime; /* Time for CPS calculations */ - tcflag_t ch_c_iflag; /* channel iflags */ tcflag_t ch_c_cflag; /* channel cflags */ tcflag_t ch_c_oflag; /* channel oflags */ @@ -215,11 +212,6 @@ u8 ch_stopc; /* Stop character */ u8 ch_startc; /* Start character */ - u32 ch_old_baud; /* Cache of the current baud */ - u32 ch_custom_speed;/* Custom baud, if set */ - - u32 ch_wopen; /* Waiting for open process cnt */ - u8 ch_mostat; /* FEP output modem status */ u8 ch_mistat; /* FEP input modem status */ diff -Naur -X linux-2.6.32-rc3-driver-core/Documentation/dontdiff linux-2.6.32-rc3-driver-core/drivers/serial/jsm/jsm_neo.c linux-2.6.32-rc3-tty/drivers/serial/jsm/jsm_neo.c --- linux-2.6.32-rc3-driver-core/drivers/serial/jsm/jsm_neo.c 2009-10-05 16:46:56.000000000 -0700 +++ linux-2.6.32-rc3-tty/drivers/serial/jsm/jsm_neo.c 2009-10-09 15:57:02.000000000 -0700 @@ -954,13 +954,8 @@ ch->ch_flags |= (CH_BAUD0); ch->ch_mostat &= ~(UART_MCR_RTS | UART_MCR_DTR); neo_assert_modem_signals(ch); - ch->ch_old_baud = 0; return; - } else if (ch->ch_custom_speed) { - baud = ch->ch_custom_speed; - if (ch->ch_flags & CH_BAUD0) - ch->ch_flags &= ~(CH_BAUD0); } else { int i; unsigned int cflag; @@ -1045,7 +1040,6 @@ quot = ch->ch_bd->bd_dividend / baud; if (quot != 0) { - ch->ch_old_baud = baud; writeb(UART_LCR_DLAB, &ch->ch_neo_uart->lcr); writeb((quot & 0xff), &ch->ch_neo_uart->txrx); writeb((quot >> 8), &ch->ch_neo_uart->ier); @@ -1123,8 +1117,6 @@ unsigned long lock_flags2; int outofloop_count = 0; - brd->intr_count++; - /* Lock out the slow poller from running on this board. */ spin_lock_irqsave(&brd->bd_intr_lock, lock_flags); diff -Naur -X linux-2.6.32-rc3-driver-core/Documentation/dontdiff linux-2.6.32-rc3-driver-core/drivers/serial/jsm/jsm_tty.c linux-2.6.32-rc3-tty/drivers/serial/jsm/jsm_tty.c --- linux-2.6.32-rc3-driver-core/drivers/serial/jsm/jsm_tty.c 2009-10-05 16:46:56.000000000 -0700 +++ linux-2.6.32-rc3-tty/drivers/serial/jsm/jsm_tty.c 2009-10-09 15:57:02.000000000 -0700 @@ -296,8 +296,6 @@ bd->bd_ops->assert_modem_signals(channel); } - channel->ch_old_baud = 0; - /* Turn off UART interrupts for this port */ channel->ch_bd->bd_ops->uart_off(channel); @@ -472,7 +470,7 @@ if (uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port)) printk(KERN_INFO "jsm: add device failed\n"); else - printk(KERN_INFO "Added device \n"); + printk(KERN_INFO "jsm: Port %d added\n", i); } jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");