--- /usr/tmp/TmpDir.3447-0/linux/linux/arch/ia64/sn/io/machvec/pci_bus_cvlink.c_1.39	Fri Mar  5 10:24:32 2004
+++ linux/linux/arch/ia64/sn/io/machvec/pci_bus_cvlink.c	Fri Mar  5 10:21:49 2004
@@ -520,25 +520,25 @@
 		} 
 
 		/* Assign addresses to the ROMs, but don't enable them yet */
-		if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
+		if ((device_dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
 			unsigned long addr;
-			size = dev->resource[PCI_ROM_RESOURCE].end -
-				dev->resource[PCI_ROM_RESOURCE].start;
+			size = device_dev->resource[PCI_ROM_RESOURCE].end -
+				device_dev->resource[PCI_ROM_RESOURCE].start;
 
 			if (size) {
-				addr = (unsigned long) pciio_pio_addr(dev,
+				addr = (unsigned long) pciio_pio_addr(vhdl, 0,
 							PCIIO_SPACE_ROM,
 							0, size, 0, PIOMAP_FIXED);
 				if (!addr) {
-					dev->resource[PCI_ROM_RESOURCE].start = 0;
-					dev->resource[PCI_ROM_RESOURCE].end = 0;
+					device_dev->resource[PCI_ROM_RESOURCE].start = 0;
+					device_dev->resource[PCI_ROM_RESOURCE].end = 0;
 					printk("sn_pci_fixup(): ROM pio map failure for "
-						"%s\n", dev->slot_name);
+						"%s\n", device_dev->slot_name);
 				}
 				addr |= __IA64_UNCACHED_OFFSET;
-				dev->resource[PCI_ROM_RESOURCE].start = addr;
-				dev->resource[PCI_ROM_RESOURCE].end = addr + size;
-				if (dev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_MEM)
+				device_dev->resource[PCI_ROM_RESOURCE].start = addr;
+				device_dev->resource[PCI_ROM_RESOURCE].end = addr + size;
+				if (device_dev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_MEM)
 					cmd |= PCI_COMMAND_MEMORY;
 			}
 		}