Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / tty / serial / altera_jtaguart.c

diff --git a/drivers/tty/serial/altera_jtaguart.c b/drivers/tty/serial/altera_jtaguart.c
index af46c56..530181e 100644 (file)
--- a/drivers/tty/serial/altera_jtaguart.c
+++ b/drivers/tty/serial/altera_jtaguart.c
@@ -219,7 +219,7 @@ static int altera_jtaguart_startup(struct uart_port *port)
        unsigned long flags;
        int ret;
 
-       ret = request_irq(port->irq, altera_jtaguart_interrupt, IRQF_DISABLED,
+       ret = request_irq(port->irq, altera_jtaguart_interrupt, 0,
                        DRV_NAME, port);
        if (ret) {
                pr_err(DRV_NAME ": unable to attach Altera JTAG UART %d "