diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /drivers/net/sunlance.c | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'drivers/net/sunlance.c')
| -rw-r--r-- | drivers/net/sunlance.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 34c0ae78a..2ce4b7509 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c @@ -1,4 +1,4 @@ -/* $Id: sunlance.c,v 1.103 2000/08/12 19:23:38 anton Exp $ +/* $Id: sunlance.c,v 1.105 2000/10/22 16:08:38 davem Exp $ * lance.c: Linux/Sparc/Lance driver * * Written 1995, 1996 by Miguel de Icaza @@ -291,9 +291,7 @@ int sparc_lance_debug = 2; #define LANCE_ADDR(x) ((long)(x) & ~0xff000000) -#ifdef MODULE static struct lance_private *root_lance_dev = NULL; -#endif /* Load the CSR registers */ static void load_csrs(struct lance_private *lp) @@ -1489,11 +1487,10 @@ no_link_test: lp->multicast_timer.data = (unsigned long) dev; lp->multicast_timer.function = &lance_set_multicast_retry; -#ifdef MODULE dev->ifindex = dev_new_index(); lp->next_module = root_lance_dev; root_lance_dev = lp; -#endif + return 0; fail: @@ -1524,9 +1521,7 @@ static int __init sparc_lance_probe(void) static struct sbus_dev sdev; static int called = 0; -#ifdef MODULE root_lance_dev = NULL; -#endif if (called) return -ENODEV; @@ -1554,9 +1549,7 @@ static int __init sparc_lance_probe(void) static int called = 0; int cards = 0, v; -#ifdef MODULE root_lance_dev = NULL; -#endif if (called) return -ENODEV; @@ -1597,7 +1590,6 @@ static int __init sparc_lance_probe(void) static void __exit sparc_lance_cleanup(void) { -#ifdef MODULE struct lance_private *lp; while (root_lance_dev) { @@ -1608,7 +1600,6 @@ static void __exit sparc_lance_cleanup(void) kfree(root_lance_dev->dev); root_lance_dev = lp; } -#endif /* MODULE */ } module_init(sparc_lance_probe); |