diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/net/3c527.c | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/net/3c527.c')
| -rw-r--r-- | drivers/net/3c527.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c index d065c3273..2a8f82e83 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/3c527.c @@ -272,19 +272,6 @@ static int __init mc32_probe1(struct net_device *dev, int slot) return -ENODEV; } - /* - * Don't allocate the private data here, it is done later - * This makes it easier to free the memory when this driver - * is used as a module. - */ - - if(dev==NULL) - { - dev = init_etherdev(0, 0); - if (dev == NULL) - return -ENOMEM; - } - /* Fill in the 'dev' fields. */ dev->base_addr = mca_io_bases[(POS>>1)&7]; dev->mem_start = mca_mem_bases[(POS>>4)&7]; @@ -1457,11 +1444,7 @@ static void mc32_reset_multicast_list(struct net_device *dev) #ifdef MODULE -static struct net_device this_device = { - "", /* will be inserted by linux/drivers/net/mc32_init.c */ - 0, 0, 0, 0, - 0, 0, /* I/O address, IRQ */ - 0, 0, 0, NULL, mc32_probe }; +static struct net_device this_device = { init: mc32_probe }; /** |