diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-21 15:28:24 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-21 15:28:24 +0400 |
commit | 470fba7ebe60ad9185056b080b331abad24b4df9 (patch) | |
tree | f83bc13d97adaf5dd0e0f1d6a157b890f868577f /net/xfrm/Kconfig | |
parent | 7225e75144b9718cbbe1820d9c011c809d5773fd (diff) | |
parent | 6a55617ed5d1aa62b850de2cf66f5ede2eef4825 (diff) | |
download | linux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz |
Merge branch 'linus' into x86/doc
Diffstat (limited to 'net/xfrm/Kconfig')
-rw-r--r-- | net/xfrm/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig index 9201ef8ad90e..6d081674515f 100644 --- a/net/xfrm/Kconfig +++ b/net/xfrm/Kconfig @@ -46,6 +46,12 @@ config XFRM_STATISTICS If unsure, say N. +config XFRM_IPCOMP + tristate + select XFRM + select CRYPTO + select CRYPTO_DEFLATE + config NET_KEY tristate "PF_KEY sockets" select XFRM |