Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / arch / x86 / crypto / Makefile

diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
index 1f6e0c2e9140e740c67f032b8af1b3b5b8e23cbd..a3a0ed80f17c38289c07a4e1a79c9886a3256ea4 100644 (file)
--- a/arch/x86/crypto/Makefile
+++ b/arch/x86/crypto/Makefile
@@ -43,6 +43,8 @@ endif
 # These modules require assembler to support AVX2.
 ifeq ($(avx2_supported),yes)
        obj-$(CONFIG_CRYPTO_BLOWFISH_AVX2_X86_64) += blowfish-avx2.o
+       obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64) += camellia-aesni-avx2.o
+       obj-$(CONFIG_CRYPTO_SERPENT_AVX2_X86_64) += serpent-avx2.o
        obj-$(CONFIG_CRYPTO_TWOFISH_AVX2_X86_64) += twofish-avx2.o
 endif
 
@@ -72,6 +74,8 @@ endif
 
 ifeq ($(avx2_supported),yes)
        blowfish-avx2-y := blowfish-avx2-asm_64.o blowfish_avx2_glue.o
+       camellia-aesni-avx2-y := camellia-aesni-avx2-asm_64.o camellia_aesni_avx2_glue.o
+       serpent-avx2-y := serpent-avx2-asm_64.o serpent_avx2_glue.o
        twofish-avx2-y := twofish-avx2-asm_64.o twofish_avx2_glue.o
 endif