From: Thiemo Seufer Date: Sun, 3 Jul 2005 19:16:13 +0000 (+0000) Subject: Brian Murphy says: X-Git-Tag: v2.6.15-rc1~731^2~1^2~165 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50bd2c72ca72c07d5640e3490845d4b0faf6c124;p=linux-2.6 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 Signed-off-by: Thiemo Seufer --- diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c index f20fde3880..88fb191ad2 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) { switch (slot) { case 1: - return LASATINT_PCIA; case 2: - return LASATINT_PCIB; case 3: - return LASATINT_PCIC; + return LASATINT_PCIA + (((slot-1) + (pin-1)) % 4); case 4: return LASATINT_ETH1; /* Ethernet 1 (LAN 2) */ case 5: