Merge branch 'juju' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux13...

[linux-2.6-omap-h63xx.git] / arch / mips / pci / pci-lasat.c

diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c
index f20fde388083ef29b08e37f3f5f8cc4a955f2fac..985784a3e6f83267d37ec9f1a17a7b21e7abce32 100644 (file)
--- a/arch/mips/pci/pci-lasat.c
+++ b/arch/mips/pci/pci-lasat.c
@@ -12,7 +12,7 @@
 #include <asm/bootinfo.h>
 
 extern struct pci_ops nile4_pci_ops;
-extern struct pci_ops gt64120_pci_ops;
+extern struct pci_ops gt64xxx_pci0_ops;
 static struct resource lasat_pci_mem_resource = {
        .name   = "LASAT PCI MEM",
        .start  = 0x18000000,
@@ -38,7 +38,7 @@ static int __init lasat_pci_setup(void)
 
        switch (mips_machtype) {
        case MACH_LASAT_100:
-                lasat_pci_controller.pci_ops = &gt64120_pci_ops;
+                lasat_pci_controller.pci_ops = &gt64xxx_pci0_ops;
                 break;
        case MACH_LASAT_200:
                 lasat_pci_controller.pci_ops = &nile4_pci_ops;
@@ -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: