Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / net / bootp.c

diff --git a/net/bootp.c b/net/bootp.c
index 309385278f35c93f89b3f28a9104e243544944ee..e679f8b7f876e236bd7ec84b7218299c3bb82f57 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -20,8 +20,6 @@
 
 #define BOOTP_VENDOR_MAGIC     0x63825363      /* RFC1048 Magic Cookie         */
 
-#if defined(CONFIG_CMD_NET)
-
 #define TIMEOUT                5000UL  /* Milliseconds before trying BOOTP again */
 #ifndef CONFIG_NET_RETRY_COUNT
 # define TIMEOUT_COUNT 5               /* # of timeouts before giving up  */
@@ -948,5 +946,3 @@ void DhcpRequest(void)
        BootpRequest();
 }
 #endif /* CONFIG_CMD_DHCP */
-
-#endif /* CONFIG_CMD_NET */