Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 03ccdb0ccf9ea3e6422e32ebfd8465633d744276..f066fa23cc050f2fb8ea1ed605d24774f11956dc 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -301,14 +301,14 @@ config CRYPTO_DEV_SAHARA
          found in some Freescale i.MX chips.
 
 config CRYPTO_DEV_S5P
-       tristate "Support for Samsung S5PV210 crypto accelerator"
-       depends on ARCH_S5PV210
+       tristate "Support for Samsung S5PV210/Exynos crypto accelerator"
+       depends on ARCH_S5PV210 || ARCH_EXYNOS
        select CRYPTO_AES
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
        help
          This option allows you to have support for S5P crypto acceleration.
-         Select this to offload Samsung S5PV210 or S5PC110 from AES
+         Select this to offload Samsung S5PV210 or S5PC110, Exynos from AES
          algorithms execution.
 
 config CRYPTO_DEV_NX