diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index b9ba9b8c..bbc7a566 100644
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -154,13 +154,13 @@ static int TxPtr;
 /*********************************************************************/
 static void whereami(const char *str);
 static int read_eeprom(unsigned long ioaddr, int location, int addr_len);
-static int davicom_probe(struct dev *dev, struct pci_device *pci);
+static int davicom_probe(struct dev *dev);
 static void davicom_init_chain(struct nic *nic);	/* Sten 10/9 */
 static void davicom_reset(struct nic *nic);
 static void davicom_transmit(struct nic *nic, const char *d, unsigned int t,
 			   unsigned int s, const char *p);
 static int davicom_poll(struct nic *nic, int retrieve);
-static void davicom_disable(struct dev *dev);
+static void davicom_disable(struct nic *nic);
 #ifdef	DAVICOM_DEBUG
 static void davicom_more(void);
 #endif /* DAVICOM_DEBUG */
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index 9bac4e81..e9d06412 100644
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -49,7 +49,7 @@ struct epic_tx_desc {
 
 static void	epic100_open(void);
 static void	epic100_init_ring(void);
-static void	epic100_disable(struct dev *dev);
+static void	epic100_disable(struct nic *nic);
 static int	epic100_poll(struct nic *nic, int retrieve);
 static void	epic100_transmit(struct nic *nic, const char *destaddr,
 				 unsigned int type, unsigned int len, const char *data);
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index 1ac86669..6356b201 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -210,7 +210,7 @@ static unsigned char rxb[NUM_RX_DESC * RX_BUF_SIZE] __attribute__ ((aligned(4)))
 
 /* Function Prototypes */
 
-static int natsemi_probe(struct dev *dev, struct pci_device *pci);
+static int natsemi_probe(struct dev *dev);
 static int eeprom_read(long addr, int location);
 static int mdio_read(int phy_id, int location);
 static void natsemi_init(struct nic *nic);
@@ -222,7 +222,7 @@ static void natsemi_set_rx_mode(struct nic *nic);
 static void natsemi_check_duplex(struct nic *nic);
 static void natsemi_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p);
 static int  natsemi_poll(struct nic *nic, int retrieve);
-static void natsemi_disable(struct dev *dev);
+static void natsemi_disable(struct nic *nic);
 static void natsemi_irq(struct nic *nic, irq_action_t action);
 
 /* 
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index 251bb131..eef1e3e4 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -172,13 +172,13 @@ static unsigned int cur_rx,cur_tx;
 static unsigned char tx_buffer[TX_BUF_SIZE] __attribute__((aligned(4)));
 static unsigned char rx_ring[RX_BUF_LEN+16] __attribute__((aligned(4)));
 
-static int rtl8139_probe(struct dev *dev, struct pci_device *pci);
+static int rtl8139_probe(struct dev *dev);
 static int read_eeprom(struct nic *nic, int location, int addr_len);
 static void rtl_reset(struct nic *nic);
 static void rtl_transmit(struct nic *nic, const char *destaddr,
 	unsigned int type, unsigned int len, const char *data);
 static int rtl_poll(struct nic *nic, int retrieve);
-static void rtl_disable(struct dev *);
+static void rtl_disable(struct nic *nic);
 static void rtl_irq(struct nic *nic, irq_action_t action);
 
 
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index b34891d5..64e10e06 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -125,7 +125,7 @@ static struct pci_driver sis_bridge_driver =
 
 /* Function Prototypes */
 
-static int sis900_probe(struct dev *dev, struct pci_device *pci);
+static int sis900_probe(struct dev *dev);
 
 static u16  sis900_read_eeprom(int location);
 static void sis900_mdio_reset(long mdio_addr);
@@ -148,7 +148,7 @@ static void sis900_transmit(struct nic *nic, const char *d,
                             unsigned int t, unsigned int s, const char *p);
 static int  sis900_poll(struct nic *nic, int retrieve);
 
-static void sis900_disable(struct dev *dev);
+static void sis900_disable(struct nic *nic);
 
 static void sis900_irq(struct nic *nic, irq_action_t action);
 
diff --git a/src/drivers/net/sk_g16.c b/src/drivers/net/sk_g16.c
index e0e8a8fc..8d2065e5 100644
--- a/src/drivers/net/sk_g16.c
+++ b/src/drivers/net/sk_g16.c
@@ -476,8 +476,8 @@ const char *d,			/* Destination */
 unsigned int t,			/* Type */
 unsigned int s,			/* size */
 const char *p);			/* Packet */
-static void SK_disable(struct dev *dev);
-static int  SK_probe(struct dev *dev, unsigned short *probe_addrs);
+static void SK_disable(struct nic *nic);
+static int  SK_probe(struct dev *dev);
 
 /*
  * LANCE Functions
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index 1037f6b9..42b11136 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -486,13 +486,13 @@ 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, struct pci_device *pci);
+static int tulip_probe(struct dev *dev);
 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,
                            unsigned int s, const char *p);
 static int tulip_poll(struct nic *nic, int retrieve);
-static void tulip_disable(struct dev *dev);
+static void tulip_disable(struct nic *nic);
 static void nway_start(struct nic *nic);
 static void pnic_do_nway(struct nic *nic);
 static void select_media(struct nic *nic, int startup);
diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index d759a20a..b2197ef3 100644
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -685,7 +685,7 @@ static int ReadMII (int byMIIIndex, int);
 static void WriteMII (char, char, char, int);
 static void MIIDelay (void);
 static void rhine_init_ring (struct nic *dev);
-static void rhine_disable (struct dev *dev);
+static void rhine_disable (struct nic *nic);
 static void rhine_reset (struct nic *nic);
 static int rhine_poll (struct nic *nic, int retreive);
 static void rhine_transmit (struct nic *nic, const char *d, unsigned int t,