diff --git a/[refs] b/[refs]
index 54cb95399318..94403efb0dbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82606d5738f29d3026159ebabba687facd25276e
+refs/heads/master: e444d14d632a1d379c1793147c61a95a24ed976a
diff --git a/trunk/arch/x86_64/crypto/Makefile b/trunk/arch/x86_64/crypto/Makefile
index 15b538a8b7f7..7f73d22b4527 100644
--- a/trunk/arch/x86_64/crypto/Makefile
+++ b/trunk/arch/x86_64/crypto/Makefile
@@ -8,5 +8,5 @@ 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
-twofish-x86_64-y := twofish-x86_64-asm.o twofish.o
+twofish-x86_64-y := twofish-x86_64-asm.o twofish_64.o
 
diff --git a/trunk/arch/x86_64/crypto/twofish.c b/trunk/arch/x86_64/crypto/twofish_64.c
similarity index 100%
rename from trunk/arch/x86_64/crypto/twofish.c
rename to trunk/arch/x86_64/crypto/twofish_64.c