projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[powerpc.git]
/
net
/
dccp
/
Makefile
diff --git
a/net/dccp/Makefile
b/net/dccp/Makefile
index
fb97bb0
..
7696e21
100644
(file)
--- a/
net/dccp/Makefile
+++ b/
net/dccp/Makefile
@@
-1,10
+1,19
@@
-obj-$(CONFIG_IP
_DCCP) += dccp
.o
+obj-$(CONFIG_IP
V6) += dccp_ipv6
.o
-dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \
- timer.o
+dccp_ipv6-y := ipv6.o
+
+obj-$(CONFIG_IP_DCCP) += dccp.o dccp_ipv4.o
+
+dccp-y := ccid.o feat.o input.o minisocks.o options.o output.o proto.o timer.o
+
+dccp_ipv4-y := ipv4.o
+
+dccp-$(CONFIG_IP_DCCP_ACKVEC) += ackvec.o
obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o
obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o
+dccp-$(CONFIG_SYSCTL) += sysctl.o
+
dccp_diag-y := diag.o
obj-y += ccids/
dccp_diag-y := diag.o
obj-y += ccids/