summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-10-14 22:36:16 +0200
committerMiguel <m.i@gmx.at>2018-10-14 22:36:16 +0200
commit2a6690e9fd53a02613796764248006e06ac482d6 (patch)
treeea3063ef3ecd0808e9291faf6c56949d91b1b09e /kernel/kernel.c
parent5aeab1c853e487aa0042d5c32200d623efe908d3 (diff)
ported vim et al
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 7f92a25..3692b17 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -158,11 +158,13 @@ void kernel_main(uint32_t eax,uint32_t ebx)
mouse_init();
// -- E1000 DRIVER --/
+ #ifndef DISABLE_E1000
if(e1000_addr)
{
klog("E1000 init ...");
e1000_init(e1000_addr);
}
+ #endif
// we wait until the end since the time will only start ticking once
// we enable interrupts.