diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:54:49 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:54:49 +0000 |
| commit | 5514f4babeeb3af00ee0c325e3cda7a562cc3d65 (patch) | |
| tree | edd733879cab73e41324a99ca5da7bc154c4196d /drivers/net/pcmcia | |
| parent | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff) | |
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'drivers/net/pcmcia')
| -rw-r--r-- | drivers/net/pcmcia/ray_cs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/pcmcia/ray_cs.c b/drivers/net/pcmcia/ray_cs.c index 36b11f907..281940845 100644 --- a/drivers/net/pcmcia/ray_cs.c +++ b/drivers/net/pcmcia/ray_cs.c @@ -385,7 +385,6 @@ static dev_link_t *ray_attach(void) DEBUG(2,"ray_cs ray_attach calling ether_setup.)\n"); ether_setup(dev); - strcpy(dev->name, local->node.dev_name); dev->init = &ray_dev_init; dev->open = &ray_open; dev->stop = &ray_dev_close; @@ -581,6 +580,8 @@ static void ray_config(dev_link_t *link) return; } + strcpy(local->node.dev_name, dev->name); + link->state &= ~DEV_CONFIG_PENDING; printk(KERN_INFO "%s: RayLink, irq %d, hw_addr ", dev->name, dev->irq); |