Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[powerpc.git] / net / dccp / Makefile

diff --git a/net/dccp/Makefile b/net/dccp/Makefile
index 5741fff..344a8da 100644 (file)
--- a/net/dccp/Makefile
+++ b/net/dccp/Makefile
@@ -1,10 +1,12 @@
 obj-$(CONFIG_IP_DCCP) += dccp.o
 
 dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
-         timer.o packet_history.o
+         timer.o
 
-obj-$(CONFIG_IP_DCCP_DIAG) += dccp_diag.o
+dccp-$(CONFIG_IP_DCCP_ACKVEC) += ackvec.o
 
-obj-y += ccids/
+obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o
 
 dccp_diag-y := diag.o
+
+obj-y += ccids/