diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:41:47 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:41:47 -0500 |
| commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
| tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/pci/ops-tx3927.c | |
| parent | 5b0ec2efb7d373faa7b1a7632c459b93895d45cd (diff) | |
| parent | d7a887a73dec6c387b02a966a71aac767bbd9ce6 (diff) | |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/pci/ops-tx3927.c')
| -rw-r--r-- | arch/mips/pci/ops-tx3927.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c index 6a3bdb5ffa80..02d64f77e967 100644 --- a/arch/mips/pci/ops-tx3927.c +++ b/arch/mips/pci/ops-tx3927.c | |||
| @@ -225,7 +225,7 @@ void __init tx3927_setup_pcierr_irq(void) | |||
| 225 | { | 225 | { |
| 226 | if (request_irq(TXX9_IRQ_BASE + TX3927_IR_PCI, | 226 | if (request_irq(TXX9_IRQ_BASE + TX3927_IR_PCI, |
| 227 | tx3927_pcierr_interrupt, | 227 | tx3927_pcierr_interrupt, |
| 228 | IRQF_DISABLED, "PCI error", | 228 | 0, "PCI error", |
| 229 | (void *)TX3927_PCIC_REG)) | 229 | (void *)TX3927_PCIC_REG)) |
| 230 | printk(KERN_WARNING "Failed to request irq for PCIERR\n"); | 230 | printk(KERN_WARNING "Failed to request irq for PCIERR\n"); |
| 231 | } | 231 | } |