Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 19:31:54 +0000 (11:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 19:31:54 +0000 (11:31 -0800)
1  2 
drivers/serial/imx.c

diff --combined drivers/serial/imx.c
index fa3bbd6c751ff966d9efea458455d8cec40f869f,d65ba9dcd26b01f6d3727f733dae772c0e18b1d4..858048efe1edbd4da7a5d2d49b5fb587a333ba28
@@@ -402,10 -402,10 +402,10 @@@ static int imx_startup(struct uart_por
                             DRIVER_NAME, sport);
        if (retval) goto error_out2;
  
 -      retval = request_irq(sport->rtsirq, imx_rtsint, 0,
 +      retval = request_irq(sport->rtsirq, imx_rtsint,
 +                           SA_TRIGGER_FALLING | SA_TRIGGER_RISING,
                             DRIVER_NAME, sport);
        if (retval) goto error_out3;
 -      set_irq_type(sport->rtsirq, IRQT_BOTHEDGE);
  
        /*
         * Finally, clear and enable interrupts
@@@ -674,7 -674,7 +674,7 @@@ static struct imx_port imx_ports[] = 
                .irq            = UART1_MINT_RX,
                .uartclk        = 16000000,
                .fifosize       = 8,
-               .flags          = ASYNC_BOOT_AUTOCONF,
+               .flags          = UPF_BOOT_AUTOCONF,
                .ops            = &imx_pops,
                .line           = 0,
        },
                .irq            = UART2_MINT_RX,
                .uartclk        = 16000000,
                .fifosize       = 8,
-               .flags          = ASYNC_BOOT_AUTOCONF,
+               .flags          = UPF_BOOT_AUTOCONF,
                .ops            = &imx_pops,
                .line           = 1,
        },