patch-1.3.85 linux/init/main.c

• Lines: 41
• Date: Mon Apr 8 11:10:35 1996
• Orig file: v1.3.84/linux/init/main.c
• Orig date: Tue Apr 2 13:32:23 1996

diff -u --recursive --new-file v1.3.84/linux/init/main.c linux/init/main.c
@@ -32,9 +32,6 @@
 #include <linux/mm.h>
 #include <linux/major.h>
 #include <linux/blk.h>
-#ifdef CONFIG_APM
-#include <linux/apm_bios.h>
-#endif
 #ifdef CONFIG_ROOT_NFS
 #include <linux/nfs_fs.h>
 #endif
@@ -135,6 +132,10 @@
 extern void teles_setup(char *str, int *ints);
 #endif
 
+#ifdef CONFIG_DIGI
+extern void pcxx_setup(char *str, int *ints);
+#endif
+
 #if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD)
 extern void ipc_init(void);
 #endif
@@ -335,6 +336,9 @@
 #ifdef CONFIG_ISDN_DRV_TELES
 	{ "teles=", teles_setup },
 #endif
+#ifdef CONFIG_DIGI
+	{ "digi=", pcxx_setup },
+#endif
 	{ 0, 0 }
 };
 
@@ -727,9 +731,6 @@
 	sock_init();
 #if defined(CONFIG_SYSVIPC) || defined(CONFIG_KERNELD)
 	ipc_init();
-#endif
-#ifdef CONFIG_APM
-	apm_bios_init();
 #endif
 	dquot_init();
 	arch_syms_export();