projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.samba.org/sfrench/cifs-2.6
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
Kconfig
diff --git
a/crypto/Kconfig
b/crypto/Kconfig
index 21ff9d015432e2e50737db0278ed7bea41ff601c..8e84225c096b6adfafcde59d08e066e5751af9c2 100644
(file)
--- 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)"
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
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)"
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
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)"
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
select CRYPTO_ALGAPI
select CRYPTO_TWOFISH_COMMON
select CRYPTO_TWOFISH_X86_64