summaryrefslogtreecommitdiff
path: root/arch/mips/pci/pci-tx4938.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-21 15:28:24 +0400
committerIngo Molnar <mingo@elte.hu>2008-08-21 15:28:24 +0400
commit470fba7ebe60ad9185056b080b331abad24b4df9 (patch)
treef83bc13d97adaf5dd0e0f1d6a157b890f868577f /arch/mips/pci/pci-tx4938.c
parent7225e75144b9718cbbe1820d9c011c809d5773fd (diff)
parent6a55617ed5d1aa62b850de2cf66f5ede2eef4825 (diff)
downloadlinux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz
Merge branch 'linus' into x86/doc
Diffstat (limited to 'arch/mips/pci/pci-tx4938.c')
-rw-r--r--arch/mips/pci/pci-tx4938.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/mips/pci/pci-tx4938.c b/arch/mips/pci/pci-tx4938.c
index e5375511c2b7..60e2c52c2c5e 100644
--- a/arch/mips/pci/pci-tx4938.c
+++ b/arch/mips/pci/pci-tx4938.c
@@ -15,6 +15,7 @@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/kernel.h>
+#include <linux/interrupt.h>
#include <asm/txx9/generic.h>
#include <asm/txx9/tx4938.h>
@@ -132,3 +133,12 @@ int tx4938_pcic1_map_irq(const struct pci_dev *dev, u8 slot)
}
return -1;
}
+
+void __init tx4938_setup_pcierr_irq(void)
+{
+ if (request_irq(TXX9_IRQ_BASE + TX4938_IR_PCIERR,
+ tx4927_pcierr_interrupt,
+ IRQF_DISABLED, "PCI error",
+ (void *)TX4927_PCIC_REG))
+ printk(KERN_WARNING "Failed to request irq for PCIERR\n");
+}