diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /drivers/net/eexpress.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/net/eexpress.c')
| -rw-r--r-- | drivers/net/eexpress.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index d5230ddda..b96da10dd 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c @@ -1623,13 +1623,10 @@ eexp_set_multicast(struct net_device *dev) #ifdef MODULE #define EEXP_MAX_CARDS 4 /* max number of cards to support */ -#define NAMELEN 8 /* max length of dev->name (inc null) */ - -static char namelist[NAMELEN * EEXP_MAX_CARDS] = { 0, }; static struct net_device dev_eexp[EEXP_MAX_CARDS] = { - { NULL, /* will allocate dynamically */ + { "", 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, express_probe }, }; @@ -1649,7 +1646,6 @@ int init_module(void) for (this_dev = 0; this_dev < EEXP_MAX_CARDS; this_dev++) { struct net_device *dev = &dev_eexp[this_dev]; - dev->name = namelist + (NAMELEN*this_dev); dev->irq = irq[this_dev]; dev->base_addr = io[this_dev]; if (io[this_dev] == 0) { |