diff --git a/[refs] b/[refs]
index cf49490f9829..6b97f42aa949 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d685249a33eb729d1dbe7ee54d63cb81fdee53da
+refs/heads/master: 3900b170baf0fa2bfe5ed43592e9acc95521fe0a
diff --git a/trunk/arch/x86_64/crypto/Makefile b/trunk/arch/x86_64/crypto/Makefile
index c96faeb842c8..fbd34ac2cda2 100644
--- a/trunk/arch/x86_64/crypto/Makefile
+++ b/trunk/arch/x86_64/crypto/Makefile
@@ -1,12 +1,5 @@
-# 
-# x86_64/crypto/Makefile 
-# 
-# Arch-specific CryptoAPI modules.
-# 
-
-obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
-obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.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
-
+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/trunk/arch/x86_64/crypto/Makefile_64 b/trunk/arch/x86_64/crypto/Makefile_64
new file mode 100644
index 000000000000..c96faeb842c8
--- /dev/null
+++ b/trunk/arch/x86_64/crypto/Makefile_64
@@ -0,0 +1,12 @@
+# 
+# x86_64/crypto/Makefile 
+# 
+# Arch-specific CryptoAPI modules.
+# 
+
+obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
+obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.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
+