From 45d9495e77dba212551ae9bc8e09b51e9ed6d324 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 23 Nov 2019 00:36:28 +0100
Subject: Tried implementing memory based paging...

Also did many other fixes/improvements.
While I think I did most things correct,
the ACPI doesn't work anymore (triple fault) and
the resolution detection fails with 0x2... :c
---
 src/kernel/fs/marfs/directory.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/kernel/fs/marfs/directory.c')

diff --git a/src/kernel/fs/marfs/directory.c b/src/kernel/fs/marfs/directory.c
index f7783bb..bf19fc7 100644
--- a/src/kernel/fs/marfs/directory.c
+++ b/src/kernel/fs/marfs/directory.c
@@ -1,8 +1,7 @@
 #include <stdint.h>
 #include <kernel/fs/ata_pio.h>
-#include <kernel/lib/alloc.h>
-#include <kernel/lib/lib.h>
-#include "marfs.h"
+#include <mlibc/stdlib.h>
+#include <kernel/fs/marfs/marfs.h>
 
 uint32_t marfs_new_dir(uint32_t uid) { return marfs_new_file(0, 0, uid, 0, 1); }
 
-- 
cgit v1.2.3