Skip to content

Commit

Permalink
crypto: camellia - drop duplicate "depends on CRYPTO"
Browse files Browse the repository at this point in the history
All 5 CAMELLIA crypto driver Kconfig symbols have a duplicate
"depends on CRYPTO" line but they are inside an
"if CRYPTO"/"endif # if CRYPTO" block, so drop the duplicate "depends"
lines.

These 5 symbols still depend on CRYPTO.

Fixes: 584fffc ("[CRYPTO] kconfig: Ordering cleanup")
Fixes: 0b95ec5 ("crypto: camellia - add assembler implementation for x86_64")
Fixes: d9b1d2e ("crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher")
Fixes: f3f935a ("crypto: camellia - add AVX2/AES-NI/x86_64 assembler implementation of camellia cipher")
Fixes: c5aac2d ("sparc64: Add DES driver making use of the new des opcodes.")
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Sebastian Siewior <[email protected]>
Cc: Jussi Kivilinna <[email protected]>
Cc: Herbert Xu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: [email protected]
Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
rddunlap authored and herbertx committed Apr 22, 2021
1 parent 87bff3d commit d17d922
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions crypto/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,6 @@ config CRYPTO_BLOWFISH_X86_64

config CRYPTO_CAMELLIA
tristate "Camellia cipher algorithms"
depends on CRYPTO
select CRYPTO_ALGAPI
help
Camellia cipher algorithms module.
Expand All @@ -1239,7 +1238,6 @@ config CRYPTO_CAMELLIA
config CRYPTO_CAMELLIA_X86_64
tristate "Camellia cipher algorithm (x86_64)"
depends on X86 && 64BIT
depends on CRYPTO
select CRYPTO_SKCIPHER
imply CRYPTO_CTR
help
Expand All @@ -1256,7 +1254,6 @@ config CRYPTO_CAMELLIA_X86_64
config CRYPTO_CAMELLIA_AESNI_AVX_X86_64
tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX)"
depends on X86 && 64BIT
depends on CRYPTO
select CRYPTO_SKCIPHER
select CRYPTO_CAMELLIA_X86_64
select CRYPTO_SIMD
Expand All @@ -1275,7 +1272,6 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64
config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX2)"
depends on X86 && 64BIT
depends on CRYPTO
select CRYPTO_CAMELLIA_AESNI_AVX_X86_64
help
Camellia cipher algorithm module (x86_64/AES-NI/AVX2).
Expand All @@ -1291,7 +1287,6 @@ config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
config CRYPTO_CAMELLIA_SPARC64
tristate "Camellia cipher algorithm (SPARC64)"
depends on SPARC64
depends on CRYPTO
select CRYPTO_ALGAPI
select CRYPTO_SKCIPHER
help
Expand Down

0 comments on commit d17d922

Please sign in to comment.