diff --git a/[refs] b/[refs]
index 0724c8445267..cf49490f9829 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4bd76e1c561e843fd7cd1f99fc295b64e261894
+refs/heads/master: d685249a33eb729d1dbe7ee54d63cb81fdee53da
diff --git a/trunk/arch/x86_64/crypto/Makefile b/trunk/arch/x86_64/crypto/Makefile
index 37ed30fabda2..c96faeb842c8 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_64.o aes.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/trunk/arch/x86_64/crypto/aes.c b/trunk/arch/x86_64/crypto/aes_64.c
similarity index 100%
rename from trunk/arch/x86_64/crypto/aes.c
rename to trunk/arch/x86_64/crypto/aes_64.c