Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / arch / mips / pci / pci-tx4927.c

diff --git a/arch/mips/pci/pci-tx4927.c b/arch/mips/pci/pci-tx4927.c
index a5807406a7f168bc62535319b84effd5756644e6..a032ae0a533dce2d8afc1d7fe94936037679661e 100644 (file)
--- a/arch/mips/pci/pci-tx4927.c
+++ b/arch/mips/pci/pci-tx4927.c
@@ -85,7 +85,7 @@ void __init tx4927_setup_pcierr_irq(void)
 {
        if (request_irq(TXX9_IRQ_BASE + TX4927_IR_PCIERR,
                        tx4927_pcierr_interrupt,
-                       IRQF_DISABLED, "PCI error",
+                       0, "PCI error",
                        (void *)TX4927_PCIC_REG))
                printk(KERN_WARNING "Failed to request irq for PCIERR\n");
 }