summaryrefslogtreecommitdiff
path: root/net/net.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-09 22:08:34 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-09 22:08:34 -0500
commit1fe80d79c5c4e52d3410a7ab4b8515da095cdab3 (patch)
tree2544ec984aed176006f720f0ea903509e5e97bba /net/net.c
parentd3b8c1a743dcd31625c99e6a44590f207eb00028 (diff)
downloadu-boot-imx-1fe80d79c5c4e52d3410a7ab4b8515da095cdab3.zip
u-boot-imx-1fe80d79c5c4e52d3410a7ab4b8515da095cdab3.tar.gz
u-boot-imx-1fe80d79c5c4e52d3410a7ab4b8515da095cdab3.tar.bz2
Finally retire cmd_confdefs.h and CONFIG_BOOTP_MASK!
All of the choices for CONFIG_BOOTP_ are now documented in the README file. You must now individually select exactly the set that you want using a series of #define CONFIG_BOOTP_<x> statements in the board port config files now. Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'net/net.c')
-rw-r--r--net/net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/net.c b/net/net.c
index 1b7b4a8..f96eb28 100644
--- a/net/net.c
+++ b/net/net.c
@@ -110,7 +110,7 @@ DECLARE_GLOBAL_DATA_PTR;
IPaddr_t NetOurSubnetMask=0; /* Our subnet mask (0=unknown) */
IPaddr_t NetOurGatewayIP=0; /* Our gateways IP address */
IPaddr_t NetOurDNSIP=0; /* Our DNS IP address */
-#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2)
+#if defined(CONFIG_BOOTP_DNS2)
IPaddr_t NetOurDNS2IP=0; /* Our 2nd DNS IP address */
#endif
char NetOurNISDomain[32]={0,}; /* Our NIS domain */