projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppc4xx: netstal/common define routines used by all boards
[oweals/u-boot.git]
/
net
/
bootp.c
diff --git
a/net/bootp.c
b/net/bootp.c
index cfe6f8dd6b9276ce8f73e1542b43a02e89f6a218..89e30d2c703e2d8423b84c0e9844bee7041dd343 100644
(file)
--- a/
net/bootp.c
+++ b/
net/bootp.c
@@
-33,7
+33,7
@@
#if defined(CONFIG_CMD_NET)
#if defined(CONFIG_CMD_NET)
-#define TIMEOUT 5
/* Seconds before trying BOOTP again */
+#define TIMEOUT 5
UL
/* Seconds before trying BOOTP again */
#ifndef CONFIG_NET_RETRY_COUNT
# define TIMEOUT_COUNT 5 /* # of timeouts before giving up */
#else
#ifndef CONFIG_NET_RETRY_COUNT
# define TIMEOUT_COUNT 5 /* # of timeouts before giving up */
#else
@@
-979,7
+979,6
@@
void DhcpRequest(void)
{
BootpRequest();
}
{
BootpRequest();
}
-#endif
-
-#endif
+#endif /* CONFIG_CMD_DHCP */
+#endif /* CONFIG_CMD_NET */