patch-2.3.24 linux/arch/ppc/kernel/chrp_pci.c

• Lines: 21
• Date: Tue Oct 26 15:02:14 1999
• Orig file: v2.3.23/linux/arch/ppc/kernel/chrp_pci.c
• Orig date: Fri Oct 22 13:21:45 1999

diff -u --recursive --new-file v2.3.23/linux/arch/ppc/kernel/chrp_pci.c linux/arch/ppc/kernel/chrp_pci.c
@@ -286,9 +286,6 @@
 	{
 		if ( dev->irq )
 			dev->irq = openpic_to_irq( dev->irq );
-		/* adjust the io_port for the NCR cards for busses other than 0 -- Cort */
-		if ( (dev->bus->number > 0) && (dev->vendor == PCI_VENDOR_ID_NCR) )
-			dev->resource[0].start += (dev->bus->number*0x08000000);
 		/* these need to be absolute addrs for OF and Matrox FB -- Cort */
 		if ( dev->vendor == PCI_VENDOR_ID_MATROX )
 		{
@@ -305,6 +302,10 @@
 			pcibios_write_config_word(dev->bus->number,
 			  dev->devfn, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);
 		}
+		if ( (dev->bus->number > 0) &&
+		     ((dev->vendor == PCI_VENDOR_ID_NCR) ||
+		      (dev->vendor == PCI_VENDOR_ID_AMD)))
+			dev->resource[0].start += (dev->bus->number*0x08000000);
 	}
 }