patch-2.3.99-pre4 linux/drivers/net/Space.c

Next file: linux/drivers/net/defxx.c
Previous file: linux/drivers/net/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre3/linux/drivers/net/Space.c linux/drivers/net/Space.c
@@ -119,7 +119,7 @@
 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);
 
@@ -185,6 +185,9 @@
 #ifdef CONFIG_NE3210
 	{ne3210_probe, 0},
 #endif
+#ifdef CONFIG_DEFXX
+	{dfx_probe, 0}.
+#endif
 	{NULL, 0},
 };
 
@@ -469,9 +472,6 @@
 	    return 1;		/* ENXIO */
 
     if (1
-#ifdef CONFIG_DEFXX
-	&& dfx_probe(dev)
-#endif
 #ifdef CONFIG_APFDDI
 	&& apfddi_init(dev)
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)