Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index c0df30faa66a..d31483c54883 100644
--- 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.