Merge remote-tracking branch 'thermal-soc/next'

[karo-tx-linux.git] / Documentation / hw_random.txt

diff --git a/Documentation/hw_random.txt b/Documentation/hw_random.txt
index 026e237bbc875ac0401cffaf33376e784da9a0b2..fce1634907d0adbd3441d2d37a102d77dc967349 100644 (file)
--- a/Documentation/hw_random.txt
+++ b/Documentation/hw_random.txt
@@ -3,7 +3,7 @@ Introduction:
        The hw_random framework is software that makes use of a
        special hardware feature on your CPU or motherboard,
        a Random Number Generator (RNG).  The software has two parts:
-       a core providing the /dev/hw_random character device and its
+       a core providing the /dev/hwrng character device and its
        sysfs support, plus a hardware-specific driver that plugs
        into that core.
 
@@ -14,7 +14,7 @@ Introduction:
 
                http://sourceforge.net/projects/gkernel/
 
-       Those tools use /dev/hw_random to fill the kernel entropy pool,
+       Those tools use /dev/hwrng to fill the kernel entropy pool,
        which is used internally and exported by the /dev/urandom and
        /dev/random special files.
 
@@ -32,13 +32,13 @@ Theory of operation:
        The rng-tools package uses such tests in "rngd", and lets you
        run them by hand with a "rngtest" utility.
 
-       /dev/hw_random is char device major 10, minor 183.
+       /dev/hwrng is char device major 10, minor 183.
 
        CLASS DEVICE.  There is a /sys/class/misc/hw_random node with
        two unique attributes, "rng_available" and "rng_current".  The
        "rng_available" attribute lists the hardware-specific drivers
        available, while "rng_current" lists the one which is currently
-       connected to /dev/hw_random.  If your system has more than one
+       connected to /dev/hwrng.  If your system has more than one
        RNG available, you may change the one used by writing a name from
        the list in "rng_available" into "rng_current".