diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 09:43:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 09:43:26 -0800 |
| commit | ceaeee6ad6c2a24bf37d9f426414cf3007432352 (patch) | |
| tree | fa330133773d10a9d7f329e3db2cc371999c6d86 /arch/mips/pci/pci-bcm1480.c | |
| parent | 3743d33edf4e49376384822c57c4ee5cdf2d32f8 (diff) | |
| parent | 5e2862eb5a263a0339a85545d96fb20995d67b1f (diff) | |
| download | lwn-ceaeee6ad6c2a24bf37d9f426414cf3007432352.tar.gz lwn-ceaeee6ad6c2a24bf37d9f426414cf3007432352.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Oprofile: Fix computation of number of counters.
[MIPS] Alchemy: fix IRQ bases
[MIPS] Alchemy: replace ffs() with __ffs()
[MIPS] BCM1480: Fix interrupt routing, take 2.
Diffstat (limited to 'arch/mips/pci/pci-bcm1480.c')
| -rw-r--r-- | arch/mips/pci/pci-bcm1480.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c index bc647cb77298..47f316c86ab1 100644 --- a/arch/mips/pci/pci-bcm1480.c +++ b/arch/mips/pci/pci-bcm1480.c @@ -76,7 +76,10 @@ static inline void WRITECFG32(u32 addr, u32 data) int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { - return K_BCM1480_INT_PCI_INTA + pin; + if (pin == 0) + return -1; + + return K_BCM1480_INT_PCI_INTA - 1 + pin; } /* Do platform specific device initialization at pci_enable_device() time */ |