Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / drivers / char / hw_random / Kconfig

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index b9918fb9587d5c82d0d954e1f669a6fcfde59604..1b223c32a8ae72f7b00bd7280ad275642a48414b 100644 (file)
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -294,20 +294,6 @@ config HW_RANDOM_POWERNV
 
          If unsure, say Y.
 
-config HW_RANDOM_EXYNOS
-       tristate "EXYNOS HW random number generator support"
-       depends on ARCH_EXYNOS || COMPILE_TEST
-       depends on HAS_IOMEM
-       default HW_RANDOM
-       ---help---
-         This driver provides kernel-side support for the Random Number
-         Generator hardware found on EXYNOS SOCs.
-
-         To compile this driver as a module, choose M here: the
-         module will be called exynos-rng.
-
-         If unsure, say Y.
-
 config HW_RANDOM_TPM
        tristate "TPM HW Random Number Generator support"
        depends on TCG_TPM
@@ -423,6 +409,20 @@ config HW_RANDOM_CAVIUM
 
          If unsure, say Y.
 
+config HW_RANDOM_MTK
+       tristate "Mediatek Random Number Generator support"
+       depends on HW_RANDOM
+       depends on ARCH_MEDIATEK || COMPILE_TEST
+       default y
+       ---help---
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on Mediatek SoCs.
+
+         To compile this driver as a module, choose M here. the
+         module will be called mtk-rng.
+
+         If unsure, say Y.
+
 config HW_RANDOM_S390
        tristate "S390 True Random Number Generator support"
        depends on S390