aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiemo Seufer <ths@networkno.de>2005-07-03 15:16:13 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:31:36 -0400
commit50bd2c72ca72c07d5640e3490845d4b0faf6c124 (patch)
treec66fbaa319dd606a5ef5dcdde813fc5287051b17
parentec125c129e864390deef47f792e3174442e4099f (diff)
Brian Murphy says:
this fixes Lasat pci to work with multi-function devices by assigning the correct values based on pin number (instead of ignoring them). Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Thiemo Seufer <ths@networkno.de>
-rw-r--r--arch/mips/pci/pci-lasat.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c
index f20fde388083..88fb191ad2eb 100644
--- a/arch/mips/pci/pci-lasat.c
+++ b/arch/mips/pci/pci-lasat.c
@@ -68,11 +68,9 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
68{ 68{
69 switch (slot) { 69 switch (slot) {
70 case 1: 70 case 1:
71 return LASATINT_PCIA;
72 case 2: 71 case 2:
73 return LASATINT_PCIB;
74 case 3: 72 case 3:
75 return LASATINT_PCIC; 73 return LASATINT_PCIA + (((slot-1) + (pin-1)) % 4);
76 case 4: 74 case 4:
77 return LASATINT_ETH1; /* Ethernet 1 (LAN 2) */ 75 return LASATINT_ETH1; /* Ethernet 1 (LAN 2) */
78 case 5: 76 case 5: