diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 17:40:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 17:40:16 -0700 |
commit | 1ff8419871ea757ae0298aa296bcff9b2ca48561 (patch) | |
tree | ff2194bc75f06107e16220ce303ef546f9a4c769 /net/ipv4/Kconfig | |
parent | MFD_TC6393XB is ARM-only (diff) | |
parent | ipsec: ipcomp - Decompress into frags if necessary (diff) | |
download | linux-dev-1ff8419871ea757ae0298aa296bcff9b2ca48561.tar.xz linux-dev-1ff8419871ea757ae0298aa296bcff9b2ca48561.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipsec: ipcomp - Decompress into frags if necessary
ipsec: ipcomp - Merge IPComp implementations
pkt_sched: Fix locking in shutdown_scheduler_queue()
Diffstat (limited to 'net/ipv4/Kconfig')
-rw-r--r-- | net/ipv4/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 4670683b4688..591ea23639ca 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -356,10 +356,8 @@ config INET_ESP config INET_IPCOMP tristate "IP: IPComp transformation" - select XFRM select INET_XFRM_TUNNEL - select CRYPTO - select CRYPTO_DEFLATE + select XFRM_IPCOMP ---help--- Support for IP Payload Compression Protocol (IPComp) (RFC3173), typically needed for IPsec. |