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/3c505.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/net/3c505.c')
| -rw-r--r-- | drivers/net/3c505.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index b333ad08c..e4b6ed4a0 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c @@ -1607,11 +1607,9 @@ int __init elplus_probe(struct net_device *dev) } #ifdef MODULE -#define NAMELEN 9 -static char devicename[ELP_MAX_CARDS][NAMELEN] = {{0,}}; static struct net_device dev_3c505[ELP_MAX_CARDS] = { - { NULL, /* device name is inserted by net_init.c */ + { "", /* device name is inserted by net_init.c */ 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, elplus_probe}, @@ -1630,7 +1628,6 @@ int init_module(void) for (this_dev = 0; this_dev < ELP_MAX_CARDS; this_dev++) { struct net_device *dev = &dev_3c505[this_dev]; - dev->name = devicename[this_dev]; dev->irq = irq[this_dev]; dev->base_addr = io[this_dev]; if (dma[this_dev]) { |