diff --git a/[refs] b/[refs]
index e334bb67766c..009998ee5174 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b767f96164b2b27488e3daa722ff16e89d49314
+refs/heads/master: 5b04fc170382195d7d33fd08e3ccc2ad8e50e782
diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
index d1cfa051afe4..423b7de61f93 100644
--- a/trunk/crypto/Makefile
+++ b/trunk/crypto/Makefile
@@ -61,7 +61,7 @@ obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o
 obj-$(CONFIG_CRYPTO_DES) += des_generic.o
 obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o
 obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o
-obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o
+obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o
 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
 obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o
 obj-$(CONFIG_CRYPTO_AES) += aes_generic.o
diff --git a/trunk/crypto/twofish.c b/trunk/crypto/twofish_generic.c
similarity index 99%
rename from trunk/crypto/twofish.c
rename to trunk/crypto/twofish_generic.c
index dfcda231f87a..1f07b843e07c 100644
--- a/trunk/crypto/twofish.c
+++ b/trunk/crypto/twofish_generic.c
@@ -212,3 +212,4 @@ module_exit(twofish_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION ("Twofish Cipher Algorithm");
+MODULE_ALIAS("twofish");