diff options
| author | Michael Brown | 2006-05-16 17:12:06 +0200 |
|---|---|---|
| committer | Michael Brown | 2006-05-16 17:12:06 +0200 |
| commit | 15ee09ed10d71969abeea9f578f061e096ef43d0 (patch) | |
| tree | fe9465a87de8f62287474b1c2dc85516b868fbf5 /src/drivers/net/via-rhine.c | |
| parent | Missed a reference to heap.h. (diff) | |
| download | ipxe-15ee09ed10d71969abeea9f578f061e096ef43d0.tar.gz ipxe-15ee09ed10d71969abeea9f578f061e096ef43d0.tar.xz ipxe-15ee09ed10d71969abeea9f578f061e096ef43d0.zip | |
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).
Diffstat (limited to 'src/drivers/net/via-rhine.c')
| -rw-r--r-- | src/drivers/net/via-rhine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c index e95d9323..ca3212ad 100644 --- a/src/drivers/net/via-rhine.c +++ b/src/drivers/net/via-rhine.c @@ -966,7 +966,7 @@ rhine_probe ( struct nic *nic, struct pci_device *pci ) { if (!pci->ioaddr) return 0; - rhine_probe1 (nic, pci, pci->ioaddr, pci->device_id, -1); + rhine_probe1 (nic, pci, pci->ioaddr, pci->device, -1); adjust_pci_device ( pci ); rhine_reset (nic); @@ -1412,7 +1412,7 @@ static struct nic_operations rhine_operations = { }; -static struct pci_id rhine_nics[] = { +static struct pci_device_id rhine_nics[] = { PCI_ROM(0x1106, 0x3065, "dlink-530tx", "VIA 6102"), PCI_ROM(0x1106, 0x3106, "via-rhine-6105", "VIA 6105"), PCI_ROM(0x1106, 0x3043, "dlink-530tx-old", "VIA 3043"), /* Rhine-I 86c100a */ |