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 | 8af00860c913d5e814f3c10232a0f42e2a964b99 (patch) | |
| tree | 8fdbac3c4d56cb9e6a7fa87829fdf17dcc7f7639 /crypto | |
| parent | 5165e5b112c4fb3a9258d5f6246cbbd44108c181 (diff) | |
| download | linux-8af00860c913d5e814f3c10232a0f42e2a964b99.tar.gz linux-8af00860c913d5e814f3c10232a0f42e2a964b99.tar.bz2 linux-8af00860c913d5e814f3c10232a0f42e2a964b99.zip | |
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')
| -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 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 |