patch-2.3.13 linux/drivers/net/yellowfin.c

• Lines: 25
• Date: Thu Aug 5 15:07:42 1999
• Orig file: v2.3.12/linux/drivers/net/yellowfin.c
• Orig date: Wed Jun 30 13:38:20 1999

diff -u --recursive --new-file v2.3.12/linux/drivers/net/yellowfin.c linux/drivers/net/yellowfin.c
@@ -377,23 +377,10 @@
 			continue;
 
 		{
-#if LINUX_VERSION_CODE >= 0x20155  ||  PCI_SUPPORT_1
 			struct pci_dev *pdev = pci_find_slot(pci_bus, pci_device_fn);
-			ioaddr = pdev->base_address[0];
+			ioaddr = pdev->resource[0].start;
 			irq = pdev->irq;
-#else
-			u32 pci_ioaddr;
-			u8 pci_irq_line;
-			pcibios_read_config_byte(pci_bus, pci_device_fn,
-									 PCI_INTERRUPT_LINE, &pci_irq_line);
-			pcibios_read_config_dword(pci_bus, pci_device_fn,
-									  PCI_BASE_ADDRESS_0, &pci_ioaddr);
-			ioaddr = pci_ioaddr;
-			irq = pci_irq_line;
-#endif
 		}
-		/* Remove I/O space marker in bit 0. */
-		ioaddr &= ~3;
 
 		if (yellowfin_debug > 2)
 			printk(KERN_INFO "Found %s at I/O %#lx, IRQ %d.\n",