diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 23:12:52 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 23:12:52 (GMT) |
| commit | 1fd5a46dd6bbca3a1275465120caf4748872c2a7 (patch) | |
| tree | c24862a43f57974394ebb58a1d9005e4093e3bf7 /crypto/Kconfig | |
| parent | 2cc6055060d975e8c7601f4a1c68ef2d3050b4e9 (diff) | |
| parent | dff2c03534f525813342ab8dec90c5bb1ee07471 (diff) | |
| download | linux-fsl-qoriq-1fd5a46dd6bbca3a1275465120caf4748872c2a7.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 52e1d41..c442f2e 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -157,7 +157,7 @@ config CRYPTO_SERPENT config CRYPTO_AES tristate "AES cipher algorithms" - depends on CRYPTO && !(X86 || UML_X86) + depends on CRYPTO help AES cipher algorithms (FIPS-197). AES uses the Rijndael algorithm. |