Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6-microblaze.git] / drivers / serial / clps711x.c

diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 6a67e8f..ce7b2e4 100644 (file)
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -104,8 +104,6 @@ static irqreturn_t clps711xuart_int_rx(int irq, void *dev_id, struct pt_regs *re
        while (!(status & SYSFLG_URXFE)) {
                ch = clps_readl(UARTDR(port));
 
-               if (tty->flip.count >= TTY_FLIPBUF_SIZE)
-                       goto ignore_char;
                port->icount.rx++;
 
                flg = TTY_NORMAL;
@@ -408,28 +406,20 @@ static struct uart_port clps711x_ports[UART_NR] = {
        {
                .iobase         = SYSCON1,
                .irq            = IRQ_UTXINT1, /* IRQ_URXINT1, IRQ_UMSINT */
-#ifdef CONFIG_MP1000_90MHZ
-               .uartclk        = 4515840,
-#else
                .uartclk        = 3686400,
-#endif
                .fifosize       = 16,
                .ops            = &clps711x_pops,
                .line           = 0,
-               .flags          = ASYNC_BOOT_AUTOCONF,
+               .flags          = UPF_BOOT_AUTOCONF,
        },
        {
                .iobase         = SYSCON2,
                .irq            = IRQ_UTXINT2, /* IRQ_URXINT2 */
-#ifdef CONFIG_MP1000_90MHZ
-               .uartclk        = 4515840,
-#else
                .uartclk        = 3686400,
-#endif
                .fifosize       = 16,
                .ops            = &clps711x_pops,
                .line           = 1,
-               .flags          = ASYNC_BOOT_AUTOCONF,
+               .flags          = UPF_BOOT_AUTOCONF,
        }
 };
 
@@ -559,7 +549,6 @@ console_initcall(clps711xuart_console_init);
 static struct uart_driver clps711x_reg = {
        .driver_name            = "ttyCL",
        .dev_name               = "ttyCL",
-       .devfs_name             = "ttyCL",
        .major                  = SERIAL_CLPS711X_MAJOR,
        .minor                  = SERIAL_CLPS711X_MINOR,
        .nr                     = UART_NR,