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/sb1000.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/net/sb1000.c')
| -rw-r--r-- | drivers/net/sb1000.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index bcf6e7e5b..a34deb630 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c @@ -1205,9 +1205,8 @@ MODULE_DESCRIPTION("General Instruments SB1000 driver"); MODULE_PARM(io, "1-2i"); MODULE_PARM(irq, "i"); -static char devname[8] = {0, }; static struct net_device dev_sb1000 = { - devname, + "", 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, sb1000_probe }; @@ -1220,8 +1219,8 @@ init_module(void) { int i; for (i = 0; i < 100; i++) { - sprintf(devname, "cm%d", i); - if (dev_get(devname) == 0) break; + sprintf(dev_sb1000.name, "cm%d", i); + if (dev_get(dev_sb1000.name) == 0) break; } if (i == 100) { printk(KERN_ERR "sb1000: can't register any device cm<n>\n"); |