diff --git a/[refs] b/[refs]
index ee8b22f204ca..15d17b19c681 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c339dd68c53ad3e0b94081c771e70132512d5377
+refs/heads/master: 6a273b2b46f9e57bd0bc1f4b905e28d2f947588d
diff --git a/trunk/arch/i386/crypto/Makefile b/trunk/arch/i386/crypto/Makefile
index 3fd19af18e34..57fcb333c9c1 100644
--- a/trunk/arch/i386/crypto/Makefile
+++ b/trunk/arch/i386/crypto/Makefile
@@ -8,5 +8,5 @@ obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
 obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
 
 aes-i586-y := aes-i586-asm.o aes.o
-twofish-i586-y := twofish-i586-asm.o twofish.o
+twofish-i586-y := twofish-i586-asm.o twofish_32.o
 
diff --git a/trunk/arch/i386/crypto/twofish.c b/trunk/arch/i386/crypto/twofish_32.c
similarity index 100%
rename from trunk/arch/i386/crypto/twofish.c
rename to trunk/arch/i386/crypto/twofish_32.c