projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6]
/
net
/
xfrm
/
Kconfig
diff --git
a/net/xfrm/Kconfig
b/net/xfrm/Kconfig
index
9201ef8
..
6d08167
100644
(file)
--- 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