diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /drivers/net/Space.c | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
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 bccd82b04..7e6910154 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -118,7 +118,7 @@ extern int de600_probe(struct net_device *); extern int de620_probe(struct net_device *); /* FDDI adapters */ -extern int dfx_probe(struct net_device *dev); +extern int dfx_probe(void); extern int apfddi_init(struct net_device *dev); extern int skfp_probe(struct net_device *dev); @@ -184,6 +184,9 @@ struct devprobe eisa_probes[] __initdata = { #ifdef CONFIG_NE3210 {ne3210_probe, 0}, #endif +#ifdef CONFIG_DEFXX + {dfx_probe, 0}. +#endif {NULL, 0}, }; @@ -465,9 +468,6 @@ static int __init fddiif_probe(struct net_device *dev) return 1; /* ENXIO */ if (1 -#ifdef CONFIG_DEFXX - && dfx_probe(dev) -#endif #ifdef CONFIG_APFDDI && apfddi_init(dev) #endif |