diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /crypto | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
Merge with temp tree to get David's gdb inferior calls patch
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 536754faf4..90d6089d60 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. |