patch-2.4.22 linux-2.4.22/arch/mips/vr41xx/nec-eagle/pci_fixup.c
Next file: linux-2.4.22/arch/mips/vr41xx/nec-eagle/setup.c
Previous file: linux-2.4.22/arch/mips/vr41xx/nec-eagle/irq.c
Back to the patch index
Back to the overall index
- Lines: 71
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/vr41xx/nec-eagle/pci_fixup.c
- Orig date:
2002-11-28 15:53:10.000000000 -0800
diff -urN linux-2.4.21/arch/mips/vr41xx/nec-eagle/pci_fixup.c linux-2.4.22/arch/mips/vr41xx/nec-eagle/pci_fixup.c
@@ -47,9 +47,7 @@
#include <linux/pci.h>
#include <asm/vr41xx/eagle.h>
-#ifdef CONFIG_VRC4173
#include <asm/vr41xx/vrc4173.h>
-#endif
void __init pcibios_fixup_resources(struct pci_dev *dev)
{
@@ -119,41 +117,44 @@
break;
}
break;
-#ifdef CONFIG_VRC4173
case 12:
- dev->irq = VRC4173_CARDU1_IRQ;
+ dev->irq = VRC4173_PCMCIA1_IRQ;
break;
case 13:
- dev->irq = VRC4173_CARDU2_IRQ;
+ dev->irq = VRC4173_PCMCIA2_IRQ;
break;
- case 24:
- dev->irq = VRC4173_CARDU1_IRQ;
- break;
- case 25:
- dev->irq = VRC4173_CARDU2_IRQ;
- break;
-#endif
case 28:
dev->irq = LANINTA_IRQ;
break;
case 29:
- dev->irq = PCISLOT_IRQ;
+ switch (pin) {
+ case 1:
+ dev->irq = PCISLOT_IRQ;
+ break;
+ case 2:
+ dev->irq = CP_INTB_IRQ;
+ break;
+ case 3:
+ dev->irq = CP_INTC_IRQ;
+ break;
+ case 4:
+ dev->irq = CP_INTD_IRQ;
+ break;
+ }
break;
-#ifdef CONFIG_VRC4173
case 30:
switch (func) {
case 0:
- dev->irq = VRC4173_IRQ;
+ dev->irq = VRC4173_CASCADE_IRQ;
break;
case 1:
- dev->irq = VRC4173_AC97U_IRQ;
+ dev->irq = VRC4173_AC97_IRQ;
break;
case 2:
- dev->irq = VRC4173_USBU_IRQ;
+ dev->irq = VRC4173_USB_IRQ;
break;
}
break;
-#endif
}
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)