patch-2.3.14 linux/init/main.c

Next file: linux/kernel/ksyms.c
Previous file: linux/include/net/x25.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.13/linux/init/main.c linux/init/main.c
@@ -52,6 +52,10 @@
 extern void nubus_init(void);
 #endif
 
+#ifdef CONFIG_ISAPNP
+#include <linux/isapnp.h>
+#endif
+
 /*
  * Versions of gcc older than that listed below may actually compile
  * and link okay, but the end product can have subtle run time bugs.
@@ -631,6 +635,9 @@
 #endif
 #ifdef CONFIG_MAC
 	nubus_init();
+#endif
+#ifdef CONFIG_ISAPNP
+	isapnp_init();
 #endif
 
 	/* Networking initialization needs a process context */ 

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