[U-Boot] [PATCH] net/sntp.c: move ifdef into Makefile COBJS-$(...)

Mike Frysinger vapier at gentoo.org
Fri Feb 6 03:04:47 CET 2009


Signed-off-by: Mike Frysinger <vapier at gentoo.org>
CC: Ben Warren <biggerbadderben at gmail.com>
---
 net/Makefile |    2 +-
 net/sntp.c   |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/net/Makefile b/net/Makefile
index 0eee330..d341874 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 425d35e..404587e 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
-- 
1.6.1.2



More information about the U-Boot mailing list