public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] net/sntp.c: move ifdef into Makefile COBJS-$(...)
@ 2009-02-06  2:04 Mike Frysinger
  2009-02-06  7:55 ` Ben Warren
  0 siblings, 1 reply; 2+ messages in thread
From: Mike Frysinger @ 2009-02-06  2:04 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
CC: Ben Warren <biggerbadderben@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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH] net/sntp.c: move ifdef into Makefile COBJS-$(...)
  2009-02-06  2:04 [U-Boot] [PATCH] net/sntp.c: move ifdef into Makefile COBJS-$(...) Mike Frysinger
@ 2009-02-06  7:55 ` Ben Warren
  0 siblings, 0 replies; 2+ messages in thread
From: Ben Warren @ 2009-02-06  7:55 UTC (permalink / raw)
  To: u-boot

Hi Mike,

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

thanks,
Ben

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-02-06  7:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-06  2:04 [U-Boot] [PATCH] net/sntp.c: move ifdef into Makefile COBJS-$(...) Mike Frysinger
2009-02-06  7:55 ` Ben Warren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox