patch-2.4.0-test9 linux/drivers/net/setup.c

• Lines: 108
• Date: Fri Sep 22 14:21:16 2000
• Orig file: v2.4.0-test8/linux/drivers/net/setup.c
• Orig date: Tue May 23 08:21:51 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/net/setup.c linux/drivers/net/setup.c
@@ -1,3 +1,4 @@
+
 /*
  *	New style setup code for the network devices
  */
@@ -22,6 +23,7 @@
 extern int awc4500_365_probe(void);
 extern int arcnet_init(void); 
 extern int scc_enet_init(void); 
+extern int fec_enet_init(void); 
 extern int dlci_setup(void); 
 extern int lapbeth_init(void);
 extern int sdla_setup(void); 
@@ -75,6 +77,9 @@
 #if defined(CONFIG_SCC_ENET)
         {scc_enet_init, 0},
 #endif
+#if defined(CONFIG_FEC_ENET)
+        {fec_enet_init, 0},
+#endif
 #if defined(CONFIG_COMX)
 	{comx_init, 0},
 #endif
@@ -162,58 +167,8 @@
 }
 
 
-static void __init appletalk_device_init(void)
-{
-#if defined(CONFIG_IPDDP)
-	extern int ipddp_init(struct net_device *dev);
-	static struct net_device dev_ipddp = {
-				"ipddp0"  __PAD6,
-				0, 0, 0, 0,
-				0x0, 0,
-				0, 0, 0, NULL, ipddp_init 
-	};
-	
-	dev_ipddp.init(&dev_ipddp);
-#endif /* CONFIG_IPDDP */
-}
-
-static void special_device_init(void)
+static void __init special_device_init(void)
 {
-#ifdef CONFIG_DUMMY
-	{
-		extern int dummy_init(struct net_device *dev);
-		static struct net_device dummy_dev = {
-			"dummy" __PAD5, 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NULL, dummy_init, 
-		};
-		register_netdev(&dummy_dev);
-	}
-#endif	
-#ifdef CONFIG_EQUALIZER
-	{
-		extern int eql_init(struct net_device *dev);
-		static struct net_device eql_dev = 
-		{
-			"eql" __PAD3,			/* Master device for IP traffic load balancing */
-			0x0, 0x0, 0x0, 0x0,		/* recv end/start; mem end/start */
-			0,				/* base I/O address */
-			0,				/* IRQ */
-			0, 0, 0,			/* flags */
-			NULL,				/* next device */
-			eql_init			/* set up the rest */
-		};
-		register_netdev(&eql_dev);
-	}
-#endif	
-#ifdef CONFIG_APBIF
-	{
-		extern int bif_init(struct net_device *dev);
-		static struct net_device bif_dev = 
-		{
-        		"bif" __PAD3, 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NULL, bif_init 
-        	};
-		register_netdev(&bif_dev);
-        }
-#endif
 #ifdef CONFIG_NET_SB1000
 	{
 		extern int sb1000_probe(struct net_device *dev);
@@ -224,15 +179,6 @@
 		register_netdev(&sb1000_dev);
 	}
 #endif
-#ifdef CONFIG_BONDING
-	{
-		extern int bond_init(struct net_device *dev);
-		static struct net_device bond_dev = {
-			"bond" __PAD4, 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NULL, bond_init,
-		};
-		register_netdev(&bond_dev);
-	}
-#endif	
 }
 
 /*
@@ -245,8 +191,6 @@
 	network_probe();
 	/* Line disciplines */
 	network_ldisc_init();
-	/* Appletalk */
-	appletalk_device_init();
 	/* Special devices */
 	special_device_init();
 	/* That kicks off the legacy init functions */