diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /arch/mips/pci/pci-bcm1480.c | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/mips/pci/pci-bcm1480.c')
| -rw-r--r-- | arch/mips/pci/pci-bcm1480.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c index 5443ea3596f8..47f316c86ab1 100644 --- a/arch/mips/pci/pci-bcm1480.c +++ b/arch/mips/pci/pci-bcm1480.c | |||
| @@ -76,8 +76,10 @@ static inline void WRITECFG32(u32 addr, u32 data) | |||
| 76 | 76 | ||
| 77 | int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | 77 | int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
| 78 | { | 78 | { |
| 79 | This is b0rked. | 79 | if (pin == 0) |
| 80 | return dev->irq; | 80 | return -1; |
| 81 | |||
| 82 | return K_BCM1480_INT_PCI_INTA - 1 + pin; | ||
| 81 | } | 83 | } |
| 82 | 84 | ||
| 83 | /* Do platform specific device initialization at pci_enable_device() time */ | 85 | /* Do platform specific device initialization at pci_enable_device() time */ |