Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block

[~andy/linux] / drivers / tty / serial / mcf.c

diff --git a/drivers/tty/serial/mcf.c b/drivers/tty/serial/mcf.c
index 3394b7cc1722397c4dd242e535af9ddbffc01eb7..9afca093d6ecef993cd4f61c71cd6e2bce928a2e 100644 (file)
--- a/drivers/tty/serial/mcf.c
+++ b/drivers/tty/serial/mcf.c
@@ -380,7 +380,7 @@ static void mcf_config_port(struct uart_port *port, int flags)
        /* Clear mask, so no surprise interrupts. */
        writeb(0, port->membase + MCFUART_UIMR);
 
-       if (request_irq(port->irq, mcf_interrupt, IRQF_DISABLED, "UART", port))
+       if (request_irq(port->irq, mcf_interrupt, 0, "UART", port))
                printk(KERN_ERR "MCF: unable to attach ColdFire UART %d "
                        "interrupt vector=%d\n", port->line, port->irq);
 }