diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 14:39:18 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 14:39:18 +0400 |
commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /arch/mips/pci/pci-tx4927.c | |
parent | 169ad16bb87c10a3f7c108bb7008ebc0270f617a (diff) | |
parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
download | linux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/mips/pci/pci-tx4927.c')
-rw-r--r-- | arch/mips/pci/pci-tx4927.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/mips/pci/pci-tx4927.c b/arch/mips/pci/pci-tx4927.c index 27e86a09dd41..aaa900596792 100644 --- a/arch/mips/pci/pci-tx4927.c +++ b/arch/mips/pci/pci-tx4927.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/tx4927.h> @@ -81,3 +82,12 @@ int __init tx4927_pciclk66_setup(void) pciclk = -1; return pciclk; } + +void __init tx4927_setup_pcierr_irq(void) +{ + if (request_irq(TXX9_IRQ_BASE + TX4927_IR_PCIERR, + tx4927_pcierr_interrupt, + IRQF_DISABLED, "PCI error", + (void *)TX4927_PCIC_REG)) + printk(KERN_WARNING "Failed to request irq for PCIERR\n"); +} |