patch-2.1.42 linux/init/main.c

• Lines: 38
• Date: Wed May 28 10:49:11 1997
• Orig file: v2.1.41/linux/init/main.c
• Orig date: Sat May 24 09:10:25 1997

diff -u --recursive --new-file v2.1.41/linux/init/main.c linux/init/main.c
@@ -169,9 +169,6 @@
 #ifdef CONFIG_ISDN_DRV_ICN
 extern void icn_setup(char *str, int *ints);
 #endif
-#ifdef CONFIG_ISDN_DRV_TELES
-extern void teles_setup(char *str, int *ints);
-#endif
 #ifdef CONFIG_ISDN_DRV_HISAX
 extern void HiSax_setup(char *str, int *ints);
 #endif
@@ -459,9 +456,6 @@
 #ifdef CONFIG_ISDN_DRV_ICN
 	{ "icn=", icn_setup },
 #endif
-#ifdef CONFIG_ISDN_DRV_TELES
-	{ "teles=", teles_setup },
-#endif
 #ifdef CONFIG_ISDN_DRV_HISAX
        { "hisax=", HiSax_setup },
        { "HiSax=", HiSax_setup },
@@ -974,7 +968,7 @@
 	if (initrd_start && mount_initrd) root_mountflags &= ~MS_RDONLY;
 	else mount_initrd =0;
 #endif
-	setup();
+	setup(0);
 
 #ifdef __SMP__
 	/*
@@ -1018,6 +1012,8 @@
 	}
 #endif
 
+	setup(1);
+	
 	if (open("/dev/console",O_RDWR,0) < 0)
 		printk("Unable to open an initial console.\n");