Changeset 8b863a62 in mainline for kernel/generic/src/main/main.c

Timestamp:

2014-04-16T17:14:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/main/main.c (modified) (2 diffs)

kernel/generic/src/main/main.c

@@ -62 +62 @@
 #include <console/kconsole.h>
 #include <console/console.h>
+#include <log.h>
 #include <cpu.h>
 #include <align.h>
@@ -281 +282 @@
         ipc_init();
         event_init();
-        klog_init();
+        kio_init();
+        log_init();
         stats_init();