projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
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
44a867f
..
344a8da
100644
(file)
--- a/
net/dccp/Makefile
+++ b/
net/dccp/Makefile
@@
-1,7
+1,9
@@
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
+
+dccp-$(CONFIG_IP_DCCP_ACKVEC) += ackvec.o
obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o