Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[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 5f3acd8e64b86d9e6ac8e685b61329322aada8c6..7cda04b335343aeb52e94b7007c38a3e3fae0c35 100644 (file)
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -91,3 +91,17 @@ config HW_RANDOM_OMAP
          module will be called omap-rng.
 
          If unsure, say Y.
+
+config HW_RANDOM_PASEMI
+       tristate "PA Semi HW Random Number Generator support"
+       depends on HW_RANDOM && PPC_PASEMI
+       default HW_RANDOM
+       ---help---
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on PA6T-1682M processor.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pasemi-rng.
+
+         If unsure, say Y.
+