diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-09 18:32:01 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-09 18:32:01 -0600 |
| commit | 3aa450c063e29b4f4b622480e1779e5e256d8f8f (patch) | |
| tree | d18942ff8bf862f2973f4e7adbf99c4f3e22a563 /crypto/Kconfig | |
| parent | d57a4282d04810417c4ed2a49cbbeda8b3569b18 (diff) | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| download | op-kernel-dev-3aa450c063e29b4f4b622480e1779e5e256d8f8f.zip op-kernel-dev-3aa450c063e29b4f4b622480e1779e5e256d8f8f.tar.gz | |
Merge tag 'v3.4-rc6' into spi/next
Linux 3.4-rc6
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 21ff9d0..8e84225 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -627,7 +627,7 @@ config CRYPTO_BLOWFISH_COMMON config CRYPTO_BLOWFISH_X86_64 tristate "Blowfish cipher algorithm (x86_64)" - depends on (X86 || UML_X86) && 64BIT + depends on X86 && 64BIT select CRYPTO_ALGAPI select CRYPTO_BLOWFISH_COMMON help @@ -657,7 +657,7 @@ config CRYPTO_CAMELLIA config CRYPTO_CAMELLIA_X86_64 tristate "Camellia cipher algorithm (x86_64)" - depends on (X86 || UML_X86) && 64BIT + depends on X86 && 64BIT depends on CRYPTO select CRYPTO_ALGAPI select CRYPTO_LRW @@ -893,7 +893,7 @@ config CRYPTO_TWOFISH_X86_64 config CRYPTO_TWOFISH_X86_64_3WAY tristate "Twofish cipher algorithm (x86_64, 3-way parallel)" - depends on (X86 || UML_X86) && 64BIT + depends on X86 && 64BIT select CRYPTO_ALGAPI select CRYPTO_TWOFISH_COMMON select CRYPTO_TWOFISH_X86_64 |
