Merge branch 'master' into isa/arm64

[lunaix-os.git] / lunaix-os / arch / x86 / boot / mb_parser.c

diff --git a/lunaix-os/arch/x86/boot/mb_parser.c b/lunaix-os/arch/x86/boot/mb_parser.c
index f38d7030aebbb0670c52df62aaac17d36b345994..595b5192ffd4a4d19a81c504b1e66cff205a6a1a 100644 (file)
--- a/lunaix-os/arch/x86/boot/mb_parser.c
+++ b/lunaix-os/arch/x86/boot/mb_parser.c
@@ -1,11 +1,12 @@
 #define __BOOT_CODE__
 
 #include <lunaix/boot_generic.h>
 #define __BOOT_CODE__
 
 #include <lunaix/boot_generic.h>

-#include <lunaix/generic/bootmem.h>

 
 #include <sys/boot/bstage.h>
 #include <sys/boot/multiboot.h>
 
 #include <sys/boot/bstage.h>
 #include <sys/boot/multiboot.h>

-#include <sys/mm/mempart.h>
+#include <sys-generic/bootmem.h>
+
+#include <asm/mempart.h>

 
 #include <klibc/string.h>
 
 
 #include <klibc/string.h>