patch-2.4.7 linux/drivers/net/setup.c

• Lines: 54
• Date: Wed Jul 4 14:41:33 2001
• Orig file: v2.4.6/linux/drivers/net/setup.c
• Orig date: Tue Feb 13 13:15:05 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/net/setup.c linux/drivers/net/setup.c
@@ -10,7 +10,6 @@
 #include <linux/netlink.h>
 
 extern int slip_init_ctrl_dev(void);
-extern int strip_init_ctrl_dev(void);
 extern int x25_asy_init_ctrl_dev(void);
   
 extern int dmascc_init(void);
@@ -23,13 +22,13 @@
 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); 
 extern int sdla_c_setup(void); 
 extern int comx_init(void);
 extern int lmc_setup(void);
 
 extern int madgemc_probe(void);
+extern int uml_net_probe(void);
 
 /* Pad device name to IFNAMSIZ=16. F.e. __PAD6 is string of 9 zeros. */
 #define __PAD6 "\0\0\0\0\0\0\0\0\0"
@@ -64,9 +63,6 @@
 #if defined(CONFIG_SDLA)
 	{sdla_c_setup, 0},
 #endif
-#if defined(CONFIG_LAPBETHER)
-	{lapbeth_init, 0},
-#endif
 #if defined(CONFIG_ARCNET)
 	{arcnet_init, 0},
 #endif
@@ -107,6 +103,10 @@
 #ifdef CONFIG_MADGEMC
 	{madgemc_probe, 0},
 #endif
+#ifdef CONFIG_UML_NET
+	{uml_net_probe, 0},
+#endif
+ 
 	{NULL, 0},
 };
 
@@ -139,9 +139,6 @@
 #endif
 #if defined(CONFIG_X25_ASY)
 	x25_asy_init_ctrl_dev();
-#endif
-#if defined(CONFIG_STRIP)
-	strip_init_ctrl_dev();
 #endif
 }