patch-2.4.22 linux-2.4.22/init/main.c

Next file: linux-2.4.22/ipc/sem.c
Previous file: linux-2.4.22/init/do_mounts.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.21/init/main.c linux-2.4.22/init/main.c
@@ -36,6 +36,10 @@
 #include <asm/ccwcache.h>
 #endif
 
+#ifdef CONFIG_ACPI
+#include <linux/acpi.h>
+#endif
+
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
 #endif
@@ -491,7 +495,9 @@
 #if defined(CONFIG_ARCH_S390)
 	s390_init_machine_check();
 #endif
-
+#ifdef CONFIG_ACPI_INTERPRETER
+	acpi_init();
+#endif
 #ifdef CONFIG_PCI
 	pci_init();
 #endif

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