From b744c01dc072a811c5ebd78324102858c56bf191 Mon Sep 17 00:00:00 2001
From: Marian Ohligs <ohligs@lfbs.rwth-aachen.de>
Date: Tue, 2 Aug 2011 13:13:04 +0200
Subject: [PATCH] - correcting some AUTO-merge faults

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

diff --git a/kernel/init.c b/kernel/init.c
index f4ceee19..97cde9e5 100755
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -169,10 +169,11 @@ int network_shutdown(void)
 #elif defined(CONFIG_PCI)
 	dhcp_release(default_netif);
 	dhcp_stop(default_netif);
+#endif
+
 	mem_free(default_netif);
 	default_netif = NULL;
 #endif
-
 	return 0;
 }