X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Fx86%2Fmain.c;h=865e53e4b27b6fee0d0f0d4577abddeab6fd8e89;hb=9edb6f7c288a93d9f9ce3f7233b577a601471071;hp=8f36f47c67b3fc247714250dec7dc6ccf2ef9f94;hpb=fd61b8c2f5e94da0265b3885525beff8e86317f6;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/main.c b/KernelLand/Kernel/arch/x86/main.c
index 8f36f47c..865e53e4 100644
--- a/KernelLand/Kernel/arch/x86/main.c
+++ b/KernelLand/Kernel/arch/x86/main.c
@@ -8,7 +8,6 @@
 #include <multiboot2.h>
 #include <init.h>
 #include <mm_virt.h>
-#include <mp.h>
 #include <pmemmap.h>
 
 #define	VGA_ERRORS	0
@@ -19,12 +18,11 @@
 
 // === IMPORTS ===
 extern char	gKernelEnd[];
-extern void	Heap_Install(void);
 extern void	MM_PreinitVirtual(void);
 extern void	MM_Install(int NPMemRanges, tPMemMapEnt *PMemRanges);
 extern void	MM_InstallVirtual(void);
 extern int	Time_Setup(void);
-//extern int	ACPICA_Initialise(void);
+extern int	ACPICA_Initialise(void);
 
 // === PROTOTYPES ===
  int	kmain(Uint MbMagic, void *MbInfoPtr);
@@ -85,8 +83,10 @@ int kmain(Uint MbMagic, void *MbInfoPtr)
 	// Start Multitasking
 	Threads_Init();
 
+	#if USE_ACPICA
 	// Poke ACPICA
-//	ACPICA_Initialise();	
+	ACPICA_Initialise();
+	#endif
 
 	Log_Log("Arch", "Starting VFS...");
 	// Load Virtual Filesystem