patch-2.1.124 linux/arch/ppc/kernel/pci.c

Next file: linux/arch/ppc/kernel/pmac_setup.c
Previous file: linux/arch/ppc/kernel/openpic.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.123/linux/arch/ppc/kernel/pci.c linux/arch/ppc/kernel/pci.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pci.c,v 1.36 1998/08/02 23:22:11 paulus Exp $
+ * $Id: pci.c,v 1.38 1998/08/31 06:28:02 cort Exp $
  * Common pmac/prep/chrp pci routines. -- Cort
  */
 
@@ -201,8 +201,22 @@
 		route_pci_interrupts();
 		for(dev=pci_devices; dev; dev=dev->next)
 		{
+			/*
+			 * Use our old hard-coded kludge to figure out what
+			 * irq this device uses.  This is necessary on things
+			 * without residual data. -- Cort
+			 */
 			unsigned char d = PCI_SLOT(dev->devfn);
 			dev->irq = Motherboard_routes[Motherboard_map[d]];
+#if 0			
+			/*
+			 * If we have residual data and if it knows about this
+			 * device ask it what the irq is.
+			 *  -- Cort
+			 */
+			ppcd = residual_find_device_id( ~0L, dev->device,
+							-1,-1,-1, 0);
+#endif			
 		}
 		break;
 	case _MACH_chrp:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov