patch-2.2.0-pre8 linux/drivers/net/Space.c

• Lines: 38
• Date: Fri Jan 15 14:36:21 1999
• Orig file: v2.2.0-pre7/linux/drivers/net/Space.c
• Orig date: Tue Dec 22 14:16:55 1998

diff -u --recursive --new-file v2.2.0-pre7/linux/drivers/net/Space.c linux/drivers/net/Space.c
@@ -128,7 +128,6 @@
 extern int apfddi_init(struct device *dev);
 
 /* HIPPI boards */
-extern int cern_hippi_probe(struct device *);
 extern int rr_hippi_probe(struct device *);
 
 struct devprobe
@@ -177,9 +176,6 @@
 #ifdef CONFIG_VORTEX
 	{tc59x_probe, 0},
 #endif
-#ifdef CONFIG_DEC_ELCP 
-	{tulip_probe, 0},
-#endif
 #ifdef CONFIG_NE2K_PCI
 	{ne2k_pci_probe, 0},
 #endif
@@ -189,6 +185,9 @@
 #ifdef CONFIG_EEXPRESS_PRO100	/* Intel EtherExpress Pro/100 */
 	{eepro100_probe, 0},
 #endif
+#ifdef CONFIG_DEC_ELCP 
+	{tulip_probe, 0},
+#endif
 #ifdef CONFIG_DE4X5             /* DEC DE425, DE434, DE435 adapters */
 	{de4x5_probe, 0},
 #endif
@@ -541,9 +540,6 @@
 		return 1;
 
 	if (1
-#ifdef CONFIG_CERN_HIPPI
-	    && cern_hippi_probe(dev)
-#endif
 #ifdef CONFIG_ROADRUNNER
 	    && rr_hippi_probe(dev)
 #endif