patch-2.0.35 linux/drivers/net/Space.c

• Lines: 63
• Date: Mon Jul 13 13:47:31 1998
• Orig file: v2.0.34/linux/drivers/net/Space.c
• Orig date: Mon Jul 13 13:46:29 1998

diff -u --recursive --new-file v2.0.34/linux/drivers/net/Space.c linux/drivers/net/Space.c
@@ -153,13 +153,13 @@
 #if defined(CONFIG_SMC9194)
 	&& smc_init(dev)
 #endif
-#if defined(CONFIG_WD80x3) || defined(WD80x3)
+#if defined(CONFIG_WD80x3)
 	&& wd_probe(dev)
 #endif
-#if defined(CONFIG_EL2) || defined(EL2)	/* 3c503 */
+#if defined(CONFIG_EL2)		/* 3c503 */
 	&& el2_probe(dev)
 #endif
-#if defined(CONFIG_HPLAN) || defined(HPLAN)
+#if defined(CONFIG_HPLAN)
 	&& hp_probe(dev)
 #endif
 #if defined(CONFIG_HPLAN_PLUS)
@@ -255,9 +255,6 @@
 #ifdef CONFIG_TLAN
 	&& tlan_probe(dev)
 #endif
-#ifdef CONFIG_PCNET32
-	&& pcnet32_probe(dev)
-#endif
 #ifdef CONFIG_LANCE
 	&& lance_probe(dev)
 #endif
@@ -275,18 +272,6 @@
 #   define NEXT_DEV	(&sdla0_dev)
 #endif
 
-#ifdef CONFIG_NETROM
-	extern int nr_init(struct device *);
-	
-	static struct device nr3_dev = { "nr3", 0, 0, 0, 0, 0, 0, 0, 0, 0, NEXT_DEV, nr_init, };
-	static struct device nr2_dev = { "nr2", 0, 0, 0, 0, 0, 0, 0, 0, 0, &nr3_dev, nr_init, };
-	static struct device nr1_dev = { "nr1", 0, 0, 0, 0, 0, 0, 0, 0, 0, &nr2_dev, nr_init, };
-	static struct device nr0_dev = { "nr0", 0, 0, 0, 0, 0, 0, 0, 0, 0, &nr1_dev, nr_init, };
-
-#   undef NEXT_DEV
-#   define	NEXT_DEV	(&nr0_dev)
-#endif
-
 /* Run-time ATtachable (Pocket) devices have a different (not "eth#") name. */
 #ifdef CONFIG_ATP		/* AT-LAN-TEC (RealTek) pocket adaptor. */
 static struct device atp_dev = {
@@ -356,6 +341,16 @@
 #undef NEXT_DEV
 #define NEXT_DEV (&slip_bootstrap)
 #endif	/* SLIP */
+  
+#if defined(CONFIG_MKISS)
+	/* To be exact, this node just hooks the initialization
+	   routines to the device structures.			*/
+extern int mkiss_init_ctrl_dev(struct device *);
+static struct device mkiss_bootstrap = {
+  "mkiss_proto", 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NEXT_DEV, mkiss_init_ctrl_dev, };
+#undef NEXT_DEV
+#define NEXT_DEV (&mkiss_bootstrap)
+#endif	/* MKISS */
   
 #if defined(CONFIG_STRIP)
 extern int strip_init_ctrl_dev(struct device *);