Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block

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

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 6373fa0ddb65e5c7a1ecab5d94281e3b4e17222a..1092a770482e53ce8597b39c9bba9dfa647db572 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -314,4 +314,15 @@ config CRYPTO_DEV_NX
          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
+       select CRYPTO_ALGAPI
+       help
+         Driver for ST-Ericsson UX500 crypto engine.
+
+if CRYPTO_DEV_UX500
+       source "drivers/crypto/ux500/Kconfig"
+endif # if CRYPTO_DEV_UX500
+
 endif # CRYPTO_HW