summaryrefslogtreecommitdiff
path: root/kernel/mem.h
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2015-05-14 14:05:54 +0200
committerMichal Idziorek <m.i@gmx.at>2015-05-14 14:05:54 +0200
commitce3968aa4a941e272171f8fcd389c4909a7a23a5 (patch)
treed3fd8fca72d0fe9f9b1d7f17a37a5fd3d2d44a16 /kernel/mem.h
parentdc7bf2f47d6f97407e3b50ae0b8ab59fd51079e5 (diff)
some clenup and recover after git-crash!
Diffstat (limited to 'kernel/mem.h')
-rw-r--r--kernel/mem.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/mem.h b/kernel/mem.h
index 521bc4a..32b1160 100644
--- a/kernel/mem.h
+++ b/kernel/mem.h
@@ -1,4 +1,5 @@
#include "types.h"
+#include "multiboot.h"
physical_address* pmmngr_alloc_block ();
void pmmngr_free_block (physical_address* p);
-void mem_init(physical_address *memmap,int entries);
+void mem_init(multiboot_information *info);