patch-2.4.0-test12 linux/init/main.c

• Lines: 63
• Date: Sun Dec 10 08:44:52 2000
• Orig file: v2.4.0-test11/linux/init/main.c
• Orig date: Sun Nov 19 18:44:23 2000

diff -u --recursive --new-file v2.4.0-test11/linux/init/main.c linux/init/main.c
@@ -51,8 +51,8 @@
 extern int con3215_activate(void);
 #endif
 
-#ifdef CONFIG_MAC
-extern void nubus_init(void);
+#ifdef CONFIG_NUBUS
+#include <linux/nubus.h>
 #endif
 
 #ifdef CONFIG_ISAPNP
@@ -80,8 +80,6 @@
 extern char _stext, _etext;
 extern char *linux_banner;
 
-extern int console_loglevel;
-
 static int init(void *);
 
 extern void init_IRQ(void);
@@ -254,7 +252,9 @@
 	{ "ida/c0d14p",0x48E0 },
 	{ "ida/c0d15p",0x48F0 },
 #endif
-
+#ifdef CONFIG_NFTL
+	{ "nftla", 0x5d00 },
+#endif
 	{ NULL, 0 }
 };
 
@@ -680,7 +680,7 @@
 #ifdef CONFIG_DIO
 	dio_init();
 #endif
-#ifdef CONFIG_MAC
+#ifdef CONFIG_NUBUS
 	nubus_init();
 #endif
 #ifdef CONFIG_ISAPNP
@@ -700,6 +700,7 @@
 	else mount_initrd =0;
 #endif
 
+	start_context_thread();
 	do_initcalls();
 
 	/* .. filesystems .. */
@@ -710,14 +711,6 @@
 #endif
 #ifdef CONFIG_PCMCIA
 	init_pcmcia_ds();		/* Do this last */
-#endif
-
-#ifdef CONFIG_HOTPLUG
-	/* do this after other 'do this last' stuff, because we want
-	 * to minimize spurious executions of /sbin/hotplug
-	 * during boot-up
-	 */
-	net_notifier_init();
 #endif
 
 	/* Mount the root filesystem.. */