Auto-update from upstream

[linux-2.6-omap-h63xx.git] / net / dccp / Makefile

diff --git a/net/dccp/Makefile b/net/dccp/Makefile
index c6e6ba55c36b559265abcc49c67067edc98c4e58..fb97bb0424553591ebd157e1ba459af124f621aa 100644 (file)
--- a/net/dccp/Makefile
+++ b/net/dccp/Makefile
@@ -1,5 +1,10 @@
 obj-$(CONFIG_IP_DCCP) += dccp.o
 
-dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o timer.o
+dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
+         timer.o
+
+obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o
+
+dccp_diag-y := diag.o
 
 obj-y += ccids/