From be7a5ff2697f73194da9007b048b9930c37eea75 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 12:32:41 +0200
Subject: [PATCH] merge  && test for master

---
 kernel/init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/init.c b/kernel/init.c
index 28301787..10ca88cc 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -150,7 +150,7 @@ int network_init(void)
 		}
 	}
 #else
-	//mmnif_open();
+        mmnif_open();
 #endif
 
 	// start echo and ping server
@@ -164,7 +164,7 @@ int network_init(void)
 int network_shutdown(void)
 {
 #if defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK)
-	//mmnif_close();
+        mmnif_close();
 #elif defined(CONFIG_LWIP) && defined(CONFIG_PCI)
 	dhcp_release(default_netif);
 	dhcp_stop(default_netif);