Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / net / rxrpc / Kconfig

diff --git a/net/rxrpc/Kconfig b/net/rxrpc/Kconfig
index d72380e304aee34f66fbeecb0e79255da91ceda4..91b3d52f6f1a45b7194c6bf7fb648cd12e3686d8 100644 (file)
--- a/net/rxrpc/Kconfig
+++ b/net/rxrpc/Kconfig
@@ -5,6 +5,7 @@
 config AF_RXRPC
        tristate "RxRPC session sockets"
        depends on EXPERIMENTAL
+       select KEYS
        help
          Say Y or M here to include support for RxRPC session sockets (just
          the transport part, not the presentation part: (un)marshalling is
@@ -29,7 +30,12 @@ config AF_RXRPC_DEBUG
 
 config RXKAD
        tristate "RxRPC Kerberos security"
-       depends on AF_RXRPC && KEYS
+       depends on AF_RXRPC
+       select CRYPTO
+       select CRYPTO_MANAGER
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_PCBC
+       select CRYPTO_FCRYPT
        help
          Provide kerberos 4 and AFS kaserver security handling for AF_RXRPC
          through the use of the key retention service.