diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-09 05:09:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-09 05:09:24 -0700 |
| commit | ded67c0e2f0388458c36e8fd3b0c8be07c53db08 (patch) | |
| tree | ccb684c18aa9bfd5659a50d65c97cf1f07da117a /net/dccp/Makefile | |
| parent | f8ef6e44474037b1671bb913bc259e048a7d5548 (diff) | |
| parent | 410e27a49bb98bc7fa3ff5fc05cc313817b9f253 (diff) | |
Merge branch 'master' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
Diffstat (limited to 'net/dccp/Makefile')
| -rw-r--r-- | net/dccp/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/dccp/Makefile b/net/dccp/Makefile index 0c1c9af2bf7..f4f8793aaff 100644 --- a/net/dccp/Makefile +++ b/net/dccp/Makefile @@ -1,7 +1,6 @@ obj-$(CONFIG_IP_DCCP) += dccp.o dccp_ipv4.o -dccp-y := ccid.o feat.o input.o minisocks.o options.o \ - qpolicy.o output.o proto.o timer.o ackvec.o +dccp-y := ccid.o feat.o input.o minisocks.o options.o output.o proto.o timer.o dccp_ipv4-y := ipv4.o @@ -9,6 +8,8 @@ dccp_ipv4-y := ipv4.o obj-$(subst y,$(CONFIG_IP_DCCP),$(CONFIG_IPV6)) += dccp_ipv6.o dccp_ipv6-y := ipv6.o +dccp-$(CONFIG_IP_DCCP_ACKVEC) += ackvec.o + obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o obj-$(CONFIG_NET_DCCPPROBE) += dccp_probe.o |