2 files changed, 17 insertions, 12 deletions

diff --git a/arch/i386/crypto/Makefile b/arch/i386/crypto/Makefile
index 7154b14cd950..fbd34ac2cda2 100644
--- a/arch/i386/crypto/Makefile
+++ b/arch/i386/crypto/Makefile
@@ -1,12 +1,5 @@
-# 
-# i386/crypto/Makefile 
-# 
-# Arch-specific CryptoAPI modules.
-# 
-
-obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
-obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
-
-aes-i586-y := aes-i586-asm_32.o aes_32.o
-twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
-
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/i386/crypto/Makefile_32
+else
+include ${srctree}/arch/x86_64/crypto/Makefile_64
+endif
diff --git a/arch/i386/crypto/Makefile_32 b/arch/i386/crypto/Makefile_32
new file mode 100644
index 000000000000..7154b14cd950
--- /dev/null
+++ b/arch/i386/crypto/Makefile_32
@@ -0,0 +1,12 @@
+# 
+# i386/crypto/Makefile 
+# 
+# Arch-specific CryptoAPI modules.
+# 
+
+obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
+obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
+
+aes-i586-y := aes-i586-asm_32.o aes_32.o
+twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
+