Merge branch 'master' into ohligs

This commit is contained in:
Marian Ohligs 2011-08-02 13:08:10 +02:00
commit 0aac6cf2be

View file

@ -163,9 +163,10 @@ int network_init(void)
int network_shutdown(void)
{
#if defined(CONFIG_LWIP) && defined(CONFIG_ROCKCREEK)
#ifdef CONFIG_LWIP
#ifdef CONFIG_ROCKCREEK
//mmnif_close();
#elif defined(CONFIG_LWIP) && defined(CONFIG_PCI)
#elif defined(CONFIG_PCI)
dhcp_release(default_netif);
dhcp_stop(default_netif);
mem_free(default_netif);