diff options
author | Richard Weinberger <richard@nod.at> | 2011-06-08 08:56:29 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-06-29 19:44:01 -0400 |
commit | 8af00860c913d5e814f3c10232a0f42e2a964b99 (patch) | |
tree | 8fdbac3c4d56cb9e6a7fa87829fdf17dcc7f7639 /crypto/Kconfig | |
parent | 5165e5b112c4fb3a9258d5f6246cbbd44108c181 (diff) |
crypto: UML build fixes
CRYPTO_GHASH_CLMUL_NI_INTEL and CRYPTO_AES_NI_INTEL cannot be used
on UML.
Commit 3e02e5cb and 54b6a1b enabled them by accident.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/Kconfig')
-rw-r--r-- | crypto/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 87b22ca9c223..2af81552d65b 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
@@ -458,7 +458,7 @@ config CRYPTO_WP512 | |||
458 | 458 | ||
459 | config CRYPTO_GHASH_CLMUL_NI_INTEL | 459 | config CRYPTO_GHASH_CLMUL_NI_INTEL |
460 | tristate "GHASH digest algorithm (CLMUL-NI accelerated)" | 460 | tristate "GHASH digest algorithm (CLMUL-NI accelerated)" |
461 | depends on (X86 || UML_X86) && 64BIT | 461 | depends on X86 && 64BIT |
462 | select CRYPTO_SHASH | 462 | select CRYPTO_SHASH |
463 | select CRYPTO_CRYPTD | 463 | select CRYPTO_CRYPTD |
464 | help | 464 | help |
@@ -533,7 +533,7 @@ config CRYPTO_AES_X86_64 | |||
533 | 533 | ||
534 | config CRYPTO_AES_NI_INTEL | 534 | config CRYPTO_AES_NI_INTEL |
535 | tristate "AES cipher algorithms (AES-NI)" | 535 | tristate "AES cipher algorithms (AES-NI)" |
536 | depends on (X86 || UML_X86) | 536 | depends on X86 |
537 | select CRYPTO_AES_X86_64 if 64BIT | 537 | select CRYPTO_AES_X86_64 if 64BIT |
538 | select CRYPTO_AES_586 if !64BIT | 538 | select CRYPTO_AES_586 if !64BIT |
539 | select CRYPTO_CRYPTD | 539 | select CRYPTO_CRYPTD |