patch-2.3.29 linux/arch/arm/kernel/bios32.c

• Lines: 32
• Date: Tue Nov 23 22:23:11 1999
• Orig file: v2.3.28/linux/arch/arm/kernel/bios32.c
• Orig date: Mon Nov 1 13:56:26 1999

diff -u --recursive --new-file v2.3.28/linux/arch/arm/kernel/bios32.c linux/arch/arm/kernel/bios32.c
@@ -218,6 +218,14 @@
 
 static int __init ebsa285_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
+	if (dev->vendor == PCI_VENDOR_ID_CONTAQ &&
+	    dev->device == PCI_DEVICE_ID_CONTAQ_82C693)
+		switch (PCI_FUNC(dev->devfn)) {
+			case 1:	return 14;
+			case 2:	return 15;
+			case 3:	return 12;
+		}
+
 	return irqmap_ebsa285[(slot + pin) & 3];
 }
 
@@ -261,6 +269,8 @@
 #define DEV(v,d) ((v)<<16|(d))
 	switch (DEV(dev->vendor, dev->device)) {
 	case DEV(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142):
+	case DEV(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C885):
+	case DEV(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_YELLOWFIN):
 		return IRQ_NETWINDER_ETHER100;
 
 	case DEV(PCI_VENDOR_ID_WINBOND2, 0x5a5a):
@@ -273,6 +283,7 @@
 		return IRQ_ISA_HARDDISK1;
 
 	case DEV(PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_2000):
+	case DEV(PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_2010):
 		return IRQ_NETWINDER_VGA;
 
 	default: