From 15ee09ed10d71969abeea9f578f061e096ef43d0 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Tue, 16 May 2006 15:12:06 +0000
Subject: Restructured PCI subsystem to fit the new device model.

Generic PCI code now handles 64-bit BARs correctly when setting
"membase"; drivers should need to call pci_bar_start() only if they want
to use BARs other than the first memory or I/O BAR.

Split rarely-used PCI functions out into pciextra.c.

Core PCI code is now 662 bytes (down from 1308 bytes in Etherboot 5.4).
284 bytes of this saving comes from the pci/pciextra split.

Cosmetic changes to lots of drivers (e.g. vendor_id->vendor in order to
match the names used in Linux).
---
 src/drivers/net/tlan.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/drivers/net/tlan.c')

diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c
index 25d66d82..bebc07a9 100644
--- a/src/drivers/net/tlan.c
+++ b/src/drivers/net/tlan.c
@@ -811,7 +811,7 @@ static int tlan_probe ( struct nic *nic, struct pci_device *pci ) {
 	i = 0;
 	chip_idx = -1;
 	while (tlan_pci_tbl[i].name) {
-		if ((((u32) pci->device_id << 16) | pci->vendor_id) ==
+		if ((((u32) pci->device << 16) | pci->vendor) ==
 		    (tlan_pci_tbl[i].id.pci & 0xffffffff)) {
 			chip_idx = i;
 			break;
@@ -819,8 +819,8 @@ static int tlan_probe ( struct nic *nic, struct pci_device *pci ) {
 		i++;
 	}
 
-	priv->vendor_id = pci->vendor_id;
-	priv->dev_id = pci->device_id;
+	priv->vendor_id = pci->vendor;
+	priv->dev_id = pci->device;
 	priv->nic_name = pci->name;
 	priv->eoc = 0;
 
@@ -1704,7 +1704,7 @@ void TLan_PhyMonitor(struct net_device *dev)
 
 #endif				/* MONITOR */
 
-static struct pci_id tlan_nics[] = {
+static struct pci_device_id tlan_nics[] = {
 	PCI_ROM(0x0e11, 0xae34, "netel10", "Compaq Netelligent 10 T PCI UTP"),
 	PCI_ROM(0x0e11, 0xae32, "netel100","Compaq Netelligent 10/100 TX PCI UTP"),
 	PCI_ROM(0x0e11, 0xae35, "netflex3i", "Compaq Integrated NetFlex-3/P"),
-- 
cgit v1.2.3-55-g7522