Merge branch 'for_3.8-rc1' into v4l_for_linus

[deliverable/linux.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 7d74d092aa8fe1bac90c6ccd8652099d138b6e2e..f6644f59fd9da1042cec58487791f689d7ed127a 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -224,7 +224,7 @@ config CRYPTO_DEV_TALITOS
 
 config CRYPTO_DEV_IXP4XX
        tristate "Driver for IXP4xx crypto hardware acceleration"
-       depends on ARCH_IXP4XX
+       depends on ARCH_IXP4XX && IXP4XX_QMGR && IXP4XX_NPE
        select CRYPTO_DES
        select CRYPTO_ALGAPI
        select CRYPTO_AUTHENC
@@ -298,21 +298,15 @@ config CRYPTO_DEV_TEGRA_AES
          will be called tegra-aes.
 
 config CRYPTO_DEV_NX
-       tristate "Support for Power7+ in-Nest cryptographic acceleration"
+       bool "Support for IBM Power7+ in-Nest cryptographic acceleration"
        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
+       default n
        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.
+         Support for Power7+ in-Nest cryptographic acceleration.
+
+if CRYPTO_DEV_NX
+       source "drivers/crypto/nx/Kconfig"
+endif
 
 config CRYPTO_DEV_UX500
        tristate "Driver for ST-Ericsson UX500 crypto hardware acceleration"
@@ -340,7 +334,7 @@ config CRYPTO_DEV_ATMEL_AES
        select CRYPTO_AES
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
-       select CONFIG_AT_HDMAC
+       select AT_HDMAC
        help
          Some Atmel processors have AES hw accelerator.
          Select this if you want to use the Atmel module for