diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
| commit | e47f00743fc4776491344f2c618cc8dc2c23bcbc (patch) | |
| tree | 13e03a113a82a184c51c19c209867cfd3a59b3b9 /drivers/net/mvme147.c | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'drivers/net/mvme147.c')
| -rw-r--r-- | drivers/net/mvme147.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c index 1d2d4c47b..17959bc2d 100644 --- a/drivers/net/mvme147.c +++ b/drivers/net/mvme147.c @@ -63,7 +63,7 @@ static unsigned short m147lance_readrdp(struct m147lance_private *lp); typedef void (*writerap_t)(void *, unsigned short); typedef void (*writerdp_t)(void *, unsigned short); -typedef void (*readrdp_t)(void *); +typedef unsigned short (*readrdp_t)(void *); #ifdef MODULE static struct m147lance_private *root_m147lance_dev = NULL; @@ -79,7 +79,7 @@ int __init mvme147lance_probe(struct net_device *dev) u_long address; if (!MACH_IS_MVME147 || called) - return(-ENODEV); + return -ENODEV; called++; SET_MODULE_OWNER(dev); @@ -96,6 +96,7 @@ int __init mvme147lance_probe(struct net_device *dev) dev->hard_start_xmit = &lance_start_xmit; dev->get_stats = &lance_get_stats; dev->set_multicast_list = &lance_set_multicast; + dev->tx_timeout = &lance_tx_timeout; dev->dma = 0; addr=(u_long *)ETHERNET_ADDRESS; |