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

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

diff --git a/drivers/tty/serial/sn_console.c b/drivers/tty/serial/sn_console.c
index 7320507b0d8509bbc5703f7787acaccbf82bb2c1..238c7df73ef57cbb43599bf7b236fa45545d6e02 100644 (file)
--- a/drivers/tty/serial/sn_console.c
+++ b/drivers/tty/serial/sn_console.c
@@ -738,7 +738,7 @@ static void __init sn_sal_switch_to_interrupts(struct sn_cons_port *port)
                DPRINTF("sn_console: switching to interrupt driven console\n");
 
                if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
-                               IRQF_DISABLED | IRQF_SHARED,
+                               IRQF_SHARED,
                                "SAL console driver", port) >= 0) {
                        spin_lock_irqsave(&port->sc_port.lock, flags);
                        port->sc_port.irq = SGI_UART_VECTOR;