diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2004-01-10 05:09:04 -0500 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@osdl.org> | 2004-01-10 05:09:04 -0500 |
| commit | 74e5aeaa1e40fceebab8e16897d1283c8763c6ff (patch) | |
| tree | 9d74ae62070ae8a9cbca049d2ab18505fb36838c /drivers/net/Space.c | |
| parent | 5828f47dd2fd18341f4253e9294bf47b13a663d1 (diff) | |
[PATCH] (33/42) macsonic
NE58-macsonic
* switched macsonic to dynamic allocation
* macsonic: fixed resource leaks on failure exits
Diffstat (limited to 'drivers/net/Space.c')
| -rw-r--r-- | drivers/net/Space.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 8fac5ce63135..3596b8722208 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -87,7 +87,7 @@ extern int mvme147lance_probe(struct net_device *dev); extern struct net_device *tc515_probe(int unit); extern struct net_device *lance_probe(int unit); extern int mace_probe(struct net_device *dev); -extern int macsonic_probe(struct net_device *dev); +extern struct net_device *macsonic_probe(int unit); extern struct net_device *mac8390_probe(int unit); extern struct net_device *mac89x0_probe(int unit); extern struct net_device *mc32_probe(int unit); @@ -323,13 +323,13 @@ static struct devprobe m68k_probes[] __initdata = { #ifdef CONFIG_MACMACE /* Mac 68k Quadra AV builtin Ethernet */ {mace_probe, 0}, #endif -#ifdef CONFIG_MACSONIC /* Mac SONIC-based Ethernet of all sorts */ - {macsonic_probe, 0}, -#endif {NULL, 0}, }; static struct devprobe2 m68k_probes2[] __initdata = { +#ifdef CONFIG_MACSONIC /* Mac SONIC-based Ethernet of all sorts */ + {macsonic_probe, 0}, +#endif #ifdef CONFIG_MAC8390 /* NuBus NS8390-based cards */ {mac8390_probe, 0}, #endif |