diff options
author | Richard Weinberger <richard@nod.at> | 2011-06-08 20:56:29 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-06-30 07:44:01 +0800 |
commit | f0c842a7b8e0dbd092dadc6e6a7cd3c7cd56cfe3 (patch) | |
tree | ef25c1bc8925a818943def5fd8984aa097afa88c | |
parent | 406293a43b86510db9876d7855cf1618cf23a55b (diff) | |
download | linux-crypto-f0c842a7b8e0dbd092dadc6e6a7cd3c7cd56cfe3.tar.gz linux-crypto-f0c842a7b8e0dbd092dadc6e6a7cd3c7cd56cfe3.zip |
crypto: UML build fixes
CRYPTO_GHASH_CLMUL_NI_INTEL and CRYPTO_AES_NI_INTEL cannot be used
on UML.
Commit 5b5d0f13 and 0c5175c 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 '')
-rw-r--r-- | crypto/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 87b22ca9..2af81552 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -458,7 +458,7 @@ config CRYPTO_WP512 config CRYPTO_GHASH_CLMUL_NI_INTEL tristate "GHASH digest algorithm (CLMUL-NI accelerated)" - depends on (X86 || UML_X86) && 64BIT + depends on X86 && 64BIT select CRYPTO_SHASH select CRYPTO_CRYPTD help @@ -533,7 +533,7 @@ config CRYPTO_AES_X86_64 config CRYPTO_AES_NI_INTEL tristate "AES cipher algorithms (AES-NI)" - depends on (X86 || UML_X86) + depends on X86 select CRYPTO_AES_X86_64 if 64BIT select CRYPTO_AES_586 if !64BIT select CRYPTO_CRYPTD |