diff options
author | Michael Brown <mcb30@etherboot.org> | 2005-04-14 15:09:28 +0000 |
---|---|---|
committer | Michael Brown <mcb30@etherboot.org> | 2005-04-14 15:09:28 +0000 |
commit | cee678de7c204c10deb5b8627327688c0b238181 (patch) | |
tree | cb32b38745ad6f2f62f2284e0cc9bd0bcdd0b140 /src/drivers/net/tulip.c | |
parent | 2c6061783617c6afce60ebb1b298602ce96359d2 (diff) | |
download | ipxe-cee678de7c204c10deb5b8627327688c0b238181.tar.gz |
Fixed up automatic modifications by hand.
Diffstat (limited to 'src/drivers/net/tulip.c')
-rw-r--r-- | src/drivers/net/tulip.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c index 57f130eba..ecd5b0171 100644 --- a/src/drivers/net/tulip.c +++ b/src/drivers/net/tulip.c @@ -486,7 +486,7 @@ static int mdio_read(struct nic *nic, int phy_id, int location); static void mdio_write(struct nic *nic, int phy_id, int location, int value); static int read_eeprom(unsigned long ioaddr, int location, int addr_len); static void parse_eeprom(struct nic *nic); -static int tulip_probe(struct dev *dev); +static int tulip_probe(struct dev *dev,struct pci_device *pci); static void tulip_init_ring(struct nic *nic); static void tulip_reset(struct nic *nic); static void tulip_transmit(struct nic *nic, const char *d, unsigned int t, @@ -1220,12 +1220,11 @@ static struct nic_operations tulip_operations = { .irq = tulip_irq, .disable = tulip_disable, }; -static struct pci_driver tulip_driver; /*********************************************************************/ /* eth_probe - Look for an adapter */ /*********************************************************************/ -static int tulip_probe ( struct dev *dev ) { +static int tulip_probe ( struct dev *dev, struct pci_device *pci ) { struct nic *nic = nic_device ( dev ); u32 i; u8 chip_rev; |