Merge origin/netpush (networking code) (XCC)
[akaros.git] / kern / src / init.c
index bd45cf1..2f323f5 100644 (file)
@@ -8,13 +8,13 @@
 #error "Yeah, it's not possible to build ROS with BSD on Core 0, sorry......"
 #else
 
-#include <ros/time.h>
 #include <arch/arch.h>
 #include <arch/console.h>
 #include <multiboot.h>
 #include <stab.h>
 #include <smp.h>
 
+#include <time.h>
 #include <atomic.h>
 #include <stdio.h>
 #include <string.h>
@@ -43,6 +43,7 @@
 #include <ext2fs.h>
 #include <kthread.h>
 #include <net.h>
+#include <socket.h>
 #include <eth_audio.h>
 #include <console.h>
 
@@ -100,6 +101,7 @@ void kernel_init(multiboot_info_t *mboot_info)
        arch_init();
        block_init();
        enable_irq();
+       socket_init();
 #ifdef __CONFIG_EXT2FS__
        mount_fs(&ext2_fs_type, "/dev/ramdisk", "/mnt", 0);
 #endif /* __CONFIG_EXT2FS__ */