Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6-omap-h63xx.git] / drivers / serial / sn_console.c

diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index 4b0afc8f12b96f2384c2c4f6ad91a96e12215be2..2f148e5b92557f17d0ca76aa92054984062fcbc3 100644 (file)
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -648,7 +648,7 @@ static irqreturn_t sn_sal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 static int sn_sal_connect_interrupt(struct sn_cons_port *port)
 {
        if (request_irq(SGI_UART_VECTOR, sn_sal_interrupt,
-                       SA_INTERRUPT | SA_SHIRQ,
+                       IRQF_DISABLED | IRQF_SHARED,
                        "SAL console driver", port) >= 0) {
                return SGI_UART_VECTOR;
        }