summaryrefslogtreecommitdiff
path: root/net/xfrm/Makefile
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-07-25 02:54:40 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-25 02:54:40 -0700
commit6fccab671f2f0a24b799f29a4ec878f62d34656c (patch)
treee90a1ac0770f8fe59bd7c8768663052a7756b950 /net/xfrm/Makefile
parentcffe1c5d7a5a1e54f7c2c6d0510f651a965bccc3 (diff)
downloadlinux-3.10-6fccab671f2f0a24b799f29a4ec878f62d34656c.tar.gz
linux-3.10-6fccab671f2f0a24b799f29a4ec878f62d34656c.tar.bz2
linux-3.10-6fccab671f2f0a24b799f29a4ec878f62d34656c.zip
ipsec: ipcomp - Merge IPComp implementations
This patch merges the IPv4/IPv6 IPComp implementations since most of the code is identical. As a result future enhancements will no longer need to be duplicated. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/Makefile')
-rw-r--r--net/xfrm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/Makefile b/net/xfrm/Makefile
index 332cfb0ff56..0f439a72cca 100644
--- a/net/xfrm/Makefile
+++ b/net/xfrm/Makefile
@@ -6,4 +6,5 @@ obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_hash.o \
xfrm_input.o xfrm_output.o xfrm_algo.o
obj-$(CONFIG_XFRM_STATISTICS) += xfrm_proc.o
obj-$(CONFIG_XFRM_USER) += xfrm_user.o
+obj-$(CONFIG_XFRM_IPCOMP) += xfrm_ipcomp.o