svn_rev_108

removed ifdefs, moved ping to own file, fix timeout handler

1 files changed, 8 insertions, 7 deletions

diff --git a/net/Makefile b/net/Makefile
index 1fb5bed7ed..c100e4ffe2 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,7 +1,8 @@
-obj-y	+= bootp.o
-obj-y	+= eth.o
-obj-y	+= net.o
-obj-y	+= nfs.o
-obj-y	+= rarp.o
-obj-y	+= sntp.o
-obj-y	+= tftp.o
+obj-$(CONFIG_NET)	+= bootp.o
+obj-$(CONFIG_NET)	+= eth.o
+obj-$(CONFIG_NET)	+= net.o
+obj-$(CONFIG_NET_NFS)	+= nfs.o
+obj-$(CONFIG_NET_RARP)	+= rarp.o
+obj-$(CONFIG_NET_SNTP)	+= sntp.o
+obj-$(CONFIG_NET_TFTP)	+= tftp.o
+obj-$(CONFIG_NET_PING)	+= ping.o