Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / char / hw_random / Kconfig

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 2d7cd486e025b45015868f2a5e51f61f36e48ed0..8d6c2089d2a8480bf1829d0b3d24bca959b22a31 100644 (file)
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -9,7 +9,14 @@ config HW_RANDOM
          Hardware Random Number Generator Core infrastructure.
 
          To compile this driver as a module, choose M here: the
-         module will be called rng-core.
+         module will be called rng-core.  This provides a device
+         that's usually called /dev/hw_random, and which exposes one
+         of possibly several hardware random number generators.
+
+         These hardware random number generators do not feed directly
+         into the kernel's random number generator.  That is usually
+         handled by the "rngd" daemon.  Documentation/hw_random.txt
+         has more information.
 
          If unsure, say Y.
 
@@ -98,7 +105,7 @@ config HW_RANDOM_PASEMI
        default HW_RANDOM
        ---help---
          This driver provides kernel-side support for the Random Number
-         Generator hardware found on PA6T-1682M processor.
+         Generator hardware found on PA Semi PWRficient SoCs.
 
          To compile this driver as a module, choose M here: the
          module will be called pasemi-rng.