patch-2.3.99-pre6 linux/drivers/atm/atmdev_init.c

Next file: linux/drivers/atm/eni.c
Previous file: linux/drivers/atm/ambassador.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/atm/atmdev_init.c linux/drivers/atm/atmdev_init.c
@@ -1,21 +1,15 @@
 /* drivers/atm/atmdev_init.c - ATM device driver initialization */
  
-/* Written 1995-1997 by Werner Almesberger, EPFL LRC */
+/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
  
 
 #include <linux/config.h>
 #include <linux/init.h>
 
 
-#ifdef CONFIG_ATM_ENI
-extern int eni_detect(void);
-#endif
 #ifdef CONFIG_ATM_ZATM
 extern int zatm_detect(void);
 #endif
-#ifdef CONFIG_ATM_TNETA1570
-extern int tneta1570_detect(void);
-#endif
 #ifdef CONFIG_ATM_NICSTAR
 extern int nicstar_detect(void);
 #endif
@@ -33,19 +27,19 @@
 #endif
 
 
+/*
+ * For historical reasons, atmdev_init returns the number of devices found.
+ * Note that some detections may not go via atmdev_init (e.g. eni.c), so this
+ * number is meaningless.
+ */
+
 int __init atmdev_init(void)
 {
 	int devs;
 
 	devs = 0;
-#ifdef CONFIG_ATM_ENI
-//	devs += eni_detect();
-#endif
 #ifdef CONFIG_ATM_ZATM
 	devs += zatm_detect();
-#endif
-#ifdef CONFIG_ATM_TNETA1570
-	devs += tneta1570_detect();
 #endif
 #ifdef CONFIG_ATM_NICSTAR
 	devs += nicstar_detect();

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