summaryrefslogtreecommitdiffstats
path: root/net/rarp.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-21 16:33:33 +0200
committerStefan Roese <sr@denx.de>2007-08-21 16:33:33 +0200
commit93f798346033a1f6d22090b47abad4be88243b04 (patch)
tree45b4d2a887a89572015de3234b04b419bfc11b44 /net/rarp.c
parent3ad63878737a5a2b1e60825bf0a7d601d7a695e7 (diff)
parent3e66c078003607a7d1d214c15a5f262bc1b4032f (diff)
downloadtalos-obmc-uboot-93f798346033a1f6d22090b47abad4be88243b04.tar.gz
talos-obmc-uboot-93f798346033a1f6d22090b47abad4be88243b04.zip
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
Diffstat (limited to 'net/rarp.c')
-rw-r--r--net/rarp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rarp.c b/net/rarp.c
index 1ba60e803c..21dfa529c9 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -29,7 +29,7 @@
#include "rarp.h"
#include "tftp.h"
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
#define TIMEOUT 5 /* Seconds before trying BOOTP again */
#ifndef CONFIG_NET_RETRY_COUNT
@@ -59,7 +59,7 @@ RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3)
*/
NetState = NETLOOP_SUCCESS;
return;
-#if (CONFIG_COMMANDS & CFG_CMD_NFS)
+#if defined(CONFIG_CMD_NFS)
} else if ((s != NULL) && !strcmp(s, "NFS")) {
NfsStart();
return;
@@ -119,4 +119,4 @@ RarpRequest (void)
NetSetHandler(RarpHandler);
}
-#endif /* CFG_CMD_NET */
+#endif
OpenPOWER on IntegriCloud