diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /crypto | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 536754faf4d2..90d6089d60ed 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -146,7 +146,7 @@ config CRYPTO_SERPENT | |||
| 146 | 146 | ||
| 147 | config CRYPTO_AES | 147 | config CRYPTO_AES |
| 148 | tristate "AES cipher algorithms" | 148 | tristate "AES cipher algorithms" |
| 149 | depends on CRYPTO && !(X86 && !X86_64) | 149 | depends on CRYPTO && !((X86 || UML_X86) && !64BIT) |
| 150 | help | 150 | help |
| 151 | AES cipher algorithms (FIPS-197). AES uses the Rijndael | 151 | AES cipher algorithms (FIPS-197). AES uses the Rijndael |
| 152 | algorithm. | 152 | algorithm. |
| @@ -166,7 +166,7 @@ config CRYPTO_AES | |||
| 166 | 166 | ||
| 167 | config CRYPTO_AES_586 | 167 | config CRYPTO_AES_586 |
| 168 | tristate "AES cipher algorithms (i586)" | 168 | tristate "AES cipher algorithms (i586)" |
| 169 | depends on CRYPTO && (X86 && !X86_64) | 169 | depends on CRYPTO && ((X86 || UML_X86) && !64BIT) |
| 170 | help | 170 | help |
| 171 | AES cipher algorithms (FIPS-197). AES uses the Rijndael | 171 | AES cipher algorithms (FIPS-197). AES uses the Rijndael |
| 172 | algorithm. | 172 | algorithm. |