Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/net/dccp/Makefile b/net/dccp/Makefile
index 344a8da153fc90d798497d4ec821b8ccf509a56d..87b27fff6e3b9122715cb44454c0e052d5b2a267 100644 (file)
--- a/net/dccp/Makefile
+++ b/net/dccp/Makefile
@@ -1,3 +1,7 @@
+obj-$(CONFIG_IPV6) += dccp_ipv6.o
+
+dccp_ipv6-y := ipv6.o
+
 obj-$(CONFIG_IP_DCCP) += dccp.o
 
 dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \