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/appletalk | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'drivers/net/appletalk')
| -rw-r--r-- | drivers/net/appletalk/cops.c | 4 | ||||
| -rw-r--r-- | drivers/net/appletalk/ltpc.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 466705f9e..76cbf0f89 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c @@ -1008,11 +1008,9 @@ static struct net_device_stats *cops_get_stats(struct net_device *dev) } #ifdef MODULE -static char lt_name[16]; - static struct net_device cops0_dev = { - lt_name, /* device name */ + "", /* device name */ 0, 0, 0, 0, 0x0, 0, /* I/O address, IRQ */ 0, 0, 0, NULL, cops_probe diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index da5afb2ad..ee1c90c02 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c @@ -1272,10 +1272,8 @@ __setup("ltpc=", ltpc_setup); #ifdef MODULE -static char dev_name[8]; - static struct net_device dev_ltpc = { - dev_name, + "", 0, 0, 0, 0, 0x0, 0, 0, 0, 0, NULL, ltpc_probe }; |