Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 69fdf18611005c395c06efcd38177491480e2495..1092a770482e53ce8597b39c9bba9dfa647db572 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -111,6 +111,7 @@ config CRYPTO_DES_S390
        depends on S390
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
+       select CRYPTO_DES
        help
          This is the s390 hardware accelerated implementation of the
          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
@@ -164,6 +165,7 @@ config CRYPTO_DEV_MV_CESA
        select CRYPTO_ALGAPI
        select CRYPTO_AES
        select CRYPTO_BLKCIPHER2
+       select CRYPTO_HASH
        help
          This driver allows you to utilize the Cryptographic Engines and
          Security Accelerator (CESA) which can be found on the Marvell Orion
@@ -295,6 +297,23 @@ config CRYPTO_DEV_TEGRA_AES
          To compile this driver as a module, choose M here: the module
          will be called tegra-aes.
 
+config CRYPTO_DEV_NX
+       tristate "Support for Power7+ in-Nest cryptographic accleration"
+       depends on PPC64 && IBMVIO
+       select CRYPTO_AES
+       select CRYPTO_CBC
+       select CRYPTO_ECB
+       select CRYPTO_CCM
+       select CRYPTO_GCM
+       select CRYPTO_AUTHENC
+       select CRYPTO_XCBC
+       select CRYPTO_SHA256
+       select CRYPTO_SHA512
+       help
+         Support for Power7+ in-Nest cryptographic acceleration. This
+         module supports acceleration for AES and SHA2 algorithms. If you
+         choose 'M' here, this module will be called nx_crypto.
+
 config CRYPTO_DEV_UX500
        tristate "Driver for ST-Ericsson UX500 crypto hardware acceleration"
        depends on ARCH_U8500