Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[pandora-kernel.git] / net / xfrm / Kconfig

diff --git a/net/xfrm/Kconfig b/net/xfrm/Kconfig
index 8f9dbec..6d08167 100644 (file)
--- a/net/xfrm/Kconfig
+++ b/net/xfrm/Kconfig
@@ -38,7 +38,7 @@ config XFRM_MIGRATE
 
 config XFRM_STATISTICS
        bool "Transformation statistics (EXPERIMENTAL)"
-       depends on XFRM && PROC_FS && EXPERIMENTAL
+       depends on INET && XFRM && PROC_FS && EXPERIMENTAL
        ---help---
          This statistics is not a SNMP/MIB specification but shows
          statistics about transformation error (or almost error) factor
@@ -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