Merge with mainline to remove plat-omap/Kconfig conflict

[safe/jmp/linux-2.6] / drivers / char / hw_random / Kconfig

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index c0df30f..d31483c 100644 (file)
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -186,3 +186,15 @@ config HW_RANDOM_MXC_RNGA
          module will be called mxc-rnga.
 
          If unsure, say Y.
+
+config HW_RANDOM_NOMADIK
+       tristate "ST-Ericsson Nomadik Random Number Generator support"
+       depends on HW_RANDOM && PLAT_NOMADIK
+       ---help---
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on ST-Ericsson SoCs (8815 and 8500).
+
+         To compile this driver as a module, choose M here: the
+         module will be called nomadik-rng.
+
+         If unsure, say Y.