diff --git a/[refs] b/[refs]
index 94403efb0dbb..73c898275b6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e444d14d632a1d379c1793147c61a95a24ed976a
+refs/heads/master: 4d2920c9c03b9044c82da16f98eb2d536d240c4e
diff --git a/trunk/arch/x86_64/crypto/Makefile b/trunk/arch/x86_64/crypto/Makefile
index 7f73d22b4527..176f5bb6b511 100644
--- a/trunk/arch/x86_64/crypto/Makefile
+++ b/trunk/arch/x86_64/crypto/Makefile
@@ -7,6 +7,6 @@
 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.o aes.o
+aes-x86_64-y := aes-x86_64-asm_64.o aes.o
 twofish-x86_64-y := twofish-x86_64-asm.o twofish_64.o
 
diff --git a/trunk/arch/x86_64/crypto/aes-x86_64-asm.S b/trunk/arch/x86_64/crypto/aes-x86_64-asm_64.S
similarity index 100%
rename from trunk/arch/x86_64/crypto/aes-x86_64-asm.S
rename to trunk/arch/x86_64/crypto/aes-x86_64-asm_64.S