From 863c5bf64dc7348a471cf1834d9b05113b7a5b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Benedikt=20Kr=C3=BCger?=
 <benedikt.krueger@rwth-aachen.de>
Date: Tue, 2 Aug 2011 15:49:23 +0200
Subject: [PATCH] merge  && test for master

---
 kernel/init.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/init.c b/kernel/init.c
index e1c4c7f0..7475d2c9 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -94,8 +94,6 @@ int network_init(void)
 		reschedule();
 	}
 
-         mmnif_open();
-
 	// Set up the lwIP network interface
 	// Allocate and configure netif
 	default_netif = (struct netif *) mem_malloc(sizeof(struct netif));
@@ -152,12 +150,12 @@ int network_init(void)
 		}
 	}
 #else
-//        mmnif_open();
+        mmnif_open();
 #endif
 
 	// start echo and ping server
- //       echo_init();
- //       ping_init();
+        echo_init();
+        ping_init();
 #endif
 
 	return 0;