summaryrefslogtreecommitdiff
path: root/crypto/Kconfig
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-05-03 11:28:58 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2010-05-03 11:28:58 +0800
commitfa09798e8294e18c391c7aa2586977bb6262957e (patch)
tree6138c7cddf9c5e664f157eb1bfaec03988198ed6 /crypto/Kconfig
parenta8f23ef06f619971e6a949ed7d4037820dbd4517 (diff)
parent9fb5d8ad81e452c5229dc9405dd2dbd08c96c74b (diff)
downloadlinux-crypto-fa09798e8294e18c391c7aa2586977bb6262957e.tar.gz
linux-crypto-fa09798e8294e18c391c7aa2586977bb6262957e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to '')
-rw-r--r--crypto/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 6a2e295e..403857ad 100644
--- 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"