From 46e045034336a2cc90c1798cd7cc07af744ddfd6 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 19 Apr 2000 04:00:00 +0000
Subject: Merge with Linux 2.3.99-pre4.

---
 drivers/net/Space.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'drivers/net/Space.c')

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);
 
@@ -183,6 +183,9 @@ struct devprobe eisa_probes[] __initdata = {
 #endif
 #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
-- 
cgit v1.2.3