diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-09 04:28:59 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-09 04:28:59 +0400 |
| commit | 0a68a20cc3eafa73bb54097c28b921147d7d3685 (patch) | |
| tree | 8e5f315226b618cb8e050a0c7653c8ec134501e3 /net/dccp/Makefile | |
| parent | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (diff) | |
| parent | a3cbdde8e9c38b66b4f13ac5d6ff1939ded0ff20 (diff) | |
| download | linux-0a68a20cc3eafa73bb54097c28b921147d7d3685.tar.xz | |
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp
Conflicts:
net/dccp/input.c
net/dccp/options.c
Diffstat (limited to 'net/dccp/Makefile')
| -rw-r--r-- | net/dccp/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/dccp/Makefile b/net/dccp/Makefile index f4f8793aafff..0c1c9af2bf7e 100644 --- a/net/dccp/Makefile +++ b/net/dccp/Makefile @@ -1,6 +1,7 @@ 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-y := ccid.o feat.o input.o minisocks.o options.o \ + qpolicy.o output.o proto.o timer.o ackvec.o dccp_ipv4-y := ipv4.o @@ -8,8 +9,6 @@ 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 |