Commit 0fe2b86c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.6-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "This fixes a random config build failure on powerpc"

* tag 'v6.6-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: powerpc/chacha20,poly1305-p10 - Add dependency on VSX
parents 29aa98d0 ba22e818

arch/powerpc/crypto/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ config CRYPTO_AES_GCM_P10 


config CRYPTO_CHACHA20_P10

	tristate "Ciphers: ChaCha20, XChacha20, XChacha12 (P10 or later)"

	depends on PPC64 && CPU_LITTLE_ENDIAN

	depends on PPC64 && CPU_LITTLE_ENDIAN && VSX

	select CRYPTO_SKCIPHER

	select CRYPTO_LIB_CHACHA_GENERIC

	select CRYPTO_ARCH_HAVE_LIB_CHACHA
@@ -127,7 +127,7 @@ config CRYPTO_CHACHA20_P10 


config CRYPTO_POLY1305_P10

	tristate "Hash functions: Poly1305 (P10 or later)"

	depends on PPC64 && CPU_LITTLE_ENDIAN

	depends on PPC64 && CPU_LITTLE_ENDIAN && VSX

	select CRYPTO_HASH

	select CRYPTO_LIB_POLY1305_GENERIC

	help