Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / drivers / char / hw_random / Kconfig

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index f48cf11c655e16f23d5da3317e165911a5f093b0..dbf22719462f9481006b5c874ca99200342b4bee 100644 (file)
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -10,7 +10,7 @@ menuconfig HW_RANDOM
 
          To compile this driver as a module, choose M here: the
          module will be called rng-core.  This provides a device
-         that's usually called /dev/hw_random, and which exposes one
+         that's usually called /dev/hwrng, and which exposes one
          of possibly several hardware random number generators.
 
          These hardware random number generators do not feed directly
@@ -346,6 +346,16 @@ config HW_RANDOM_MSM
 
          If unsure, say Y.
 
+config HW_RANDOM_ST
+       tristate "ST Microelectronics HW Random Number Generator support"
+       depends on HW_RANDOM && ARCH_STI
+       ---help---
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on STi series of SoCs.
+
+         To compile this driver as a module, choose M here: the
+         module will be called st-rng.
+
 config HW_RANDOM_XGENE
        tristate "APM X-Gene True Random Number Generator (TRNG) support"
        depends on HW_RANDOM && ARCH_XGENE
@@ -359,6 +369,18 @@ config HW_RANDOM_XGENE
 
          If unsure, say Y.
 
+config HW_RANDOM_STM32
+       tristate "STMicroelectronics STM32 random number generator"
+       depends on HW_RANDOM && (ARCH_STM32 || COMPILE_TEST)
+       help
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on STM32 microcontrollers.
+
+         To compile this driver as a module, choose M here: the
+         module will be called stm32-rng.
+
+         If unsure, say N.
+
 endif # HW_RANDOM
 
 config UML_RANDOM