From 5d94954d3adb263295507aa50e0683f9b35e8d00 Mon Sep 17 00:00:00 2001
From: Stefan Lankes <lankes@lfbs.rwth-aachen.de>
Date: Fri, 25 Mar 2011 07:46:23 +0100
Subject: [PATCH] move koutput_init to the function lowlevel_init

---
 kernel/init.c   | 8 ++------
 kernel/main.c   | 1 -
 libkern/stdio.c | 4 ++++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/kernel/init.c b/kernel/init.c
index 640029a3..2fafb5b9 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -25,9 +25,6 @@
 #include <metalsvm/tasks.h>
 #include <metalsvm/errno.h>
 #include <metalsvm/init.h>
-#ifdef CONFIG_VGA
-#include <asm/vga.h>
-#endif
 #ifdef CONFIG_LWIP
 #include <lwip/init.h>
 #include <lwip/sys.h>
@@ -47,9 +44,8 @@ static volatile int done = 0;
 
 int lowlevel_init(void)
 {
-#ifdef CONFIG_VGA
-	vga_init();
-#endif
+	koutput_init();
+
 	return 0;
 }
 
diff --git a/kernel/main.c b/kernel/main.c
index a67e2bde..eae0ec05 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -89,7 +89,6 @@ int main(void)
 #endif
 	multitasking_init();
 	mmu_init();
-	koutput_init();
    	initrd_init();
 
 	irq_enable();
diff --git a/libkern/stdio.c b/libkern/stdio.c
index 451e85f6..ba989954 100644
--- a/libkern/stdio.c
+++ b/libkern/stdio.c
@@ -41,6 +41,10 @@ static unsigned char kmessages[KMSG_SIZE] = {[0 ... KMSG_SIZE-1] = 0x00};
 
 int koutput_init(void)
 {
+#ifdef CONFIG_VGA
+	vga_init();
+#endif
+
 	return 0;
 }