summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2007-12-02 13:09:11 +0100
committerRalf Baechle <ralf@linux-mips.org>2007-12-03 20:40:26 +0100
commita6733f2e146a5f4884bc23023bf56f3a2698b547 (patch)
tree78e6687f31a1ee2d61f879d8aa335361e3f8b66c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 (diff)
downloadlinux-a6733f2e146a5f4884bc23023bf56f3a2698b547.tar.xz
linux-a6733f2e146a5f4884bc23023bf56f3a2698b547.zip
[MIPS] BCM1480: Fix interrupt routing.
The old code did did only work as long as CFE and the kernel were using the same interrupt numbering ... Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/pci/pci-bcm1480.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index 5443ea3596f8..bc647cb77298 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -76,8 +76,7 @@ static inline void WRITECFG32(u32 addr, u32 data)
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
- This is b0rked.
- return dev->irq;
+ return K_BCM1480_INT_PCI_INTA + pin;
}
/* Do platform specific device initialization at pci_enable_device() time */