summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-05 21:04:47 -0500
committerBen Warren <biggerbadderben@gmail.com>2009-02-09 22:53:54 -0800
commit638ed3e296e70fab286d157b7adedaaa4a09a474 (patch)
treed6010c988920942fc600fa8da72c1541b401ac19
parent9e5be8214ba751436e57c3be044bf6dccb9a6687 (diff)
downloadtalos-obmc-uboot-638ed3e296e70fab286d157b7adedaaa4a09a474.tar.gz
talos-obmc-uboot-638ed3e296e70fab286d157b7adedaaa4a09a474.zip
net/sntp.c: move ifdef into Makefile COBJS-$(...)
Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
-rw-r--r--net/Makefile2
-rw-r--r--net/sntp.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/net/Makefile b/net/Makefile
index 0eee330cfe..d341874250 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -33,7 +33,7 @@ COBJS-y += bootp.o
COBJS-y += rarp.o
COBJS-y += eth.o
COBJS-y += nfs.o
-COBJS-y += sntp.o
+COBJS-$(CONFIG_CMD_SNTP) += sntp.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
diff --git a/net/sntp.c b/net/sntp.c
index 425d35edd8..404587e80e 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -12,8 +12,6 @@
#include "sntp.h"
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_SNTP)
-
#define SNTP_TIMEOUT 10000UL
static int SntpOurPort;
@@ -88,5 +86,3 @@ SntpStart (void)
SntpSend ();
}
-
-#endif
OpenPOWER on IntegriCloud