1 files changed, 15 insertions, 5 deletions
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
index 18dcdc6fb7aa..46bb609e2444 100644
--- a/arch/x86/crypto/Makefile
+++ b/arch/x86/crypto/Makefile
@@ -1,5 +1,15 @@
-ifeq ($(CONFIG_X86_32),y)
+#
-include ${srctree}/arch/x86/crypto/Makefile_32
+# Arch-specific CryptoAPI modules.
-else
+#
-include ${srctree}/arch/x86/crypto/Makefile_64
-endif
+obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
+obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
+obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
+obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
+aes-i586-y := aes-i586-asm_32.o aes_32.o
+twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
+aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o
+twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o

diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile index 18dcdc6fb7aa..46bb609e2444 100644 --- a/arch/x86/crypto/Makefile +++ b/arch/x86/crypto/Makefile
@@ -1,5 +1,15 @@
1	ifeq ($(CONFIG_X86_32),y)	1	#
2	include ${srctree}/arch/x86/crypto/Makefile_32	2	# Arch-specific CryptoAPI modules.
3	else	3	#
4	include ${srctree}/arch/x86/crypto/Makefile_64	4
5	endif	5	obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
		6	obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
		7
		8	obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
		9	obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
		10
		11	aes-i586-y := aes-i586-asm_32.o aes_32.o
		12	twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
		13
		14	aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o
		15	twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o