Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 6a2e295..403857a 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -826,8 +826,8 @@ config CRYPTO_ANSI_CPRNG
        help
          This option enables the generic pseudo random number generator
          for cryptographic modules.  Uses the Algorithm specified in
-         ANSI X9.31 A.2.4. Not this option must be enabled if CRYPTO_FIPS 
-         is selected
+         ANSI X9.31 A.2.4. Note that this option must be enabled if
+         CRYPTO_FIPS is selected
 
 source "drivers/crypto/Kconfig"