Commit d17d9227 authored by Randy Dunlap's avatar Randy Dunlap Committed by Herbert Xu
Browse files

crypto: camellia - drop duplicate "depends on CRYPTO" 



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: 584fffc8 ("[CRYPTO] kconfig: Ordering cleanup")
Fixes: 0b95ec56 ("crypto: camellia - add assembler implementation for x86_64")
Fixes: d9b1d2e7 ("crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher")
Fixes: f3f935a7 ("crypto: camellia - add AVX2/AES-NI/x86_64 assembler implementation of camellia cipher")
Fixes: c5aac2df ("sparc64: Add DES driver making use of the new des opcodes.")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Sebastian Siewior <sebastian@breakpoint.cc>
Cc: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 87bff3d8

crypto/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -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.
@@ -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
@@ -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
@@ -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).
@@ -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