aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2019-11-10 19:50:14 +0100
committerMarvin Borner2019-11-10 19:50:14 +0100
commit7e06dfe06a0f7847eed105bc4f7ccb22df5228fc (patch)
tree446f7eeeb998b93da221d6bf14adca9df63dba69 /src/kernel/kernel.c
parenta30a9b21c3e0af7996a551381a8f41075bada7ad (diff)
Added semi-working bootloader
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 214ecf0..70f9d60 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -6,14 +6,13 @@
#include <kernel/paging/paging.h>
#include <kernel/input/input.h>
#include <kernel/acpi/acpi.h>
-#include <kernel/mutliboot.h>
#include <kernel/fs/initrd.h>
#include <kernel/syscall/syscall.h>
#include <kernel/smbios/smbios.h>
extern void switch_to_user();
-void kernel_main(struct multiboot *mboot_ptr) {
+void kernel_main() {
vga_log("Installing basic features of Melvix...", 0);
// Install features
timer_install();