diff --git a/[refs] b/[refs]
index 96b314edd6c6..b9e13cd0df2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4de5933780f897b89e4863fa545c08a086325353
+refs/heads/master: 075e39df6718503d98d63a3f392ad53f81d3077a
diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
index f638063f4ea9..43559438ca51 100644
--- a/trunk/crypto/Makefile
+++ b/trunk/crypto/Makefile
@@ -67,7 +67,8 @@ obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o
 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
 obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o
 obj-$(CONFIG_CRYPTO_AES) += aes_generic.o
-obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o
+camellia_generic-y = camellia.o
+obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia_generic.o
 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
 obj-$(CONFIG_CRYPTO_CAST6) += cast6.o
 obj-$(CONFIG_CRYPTO_ARC4) += arc4.o
diff --git a/trunk/crypto/camellia.c b/trunk/crypto/camellia.c
index 7ae4bcddd1de..f07a19b3caad 100644
--- a/trunk/crypto/camellia.c
+++ b/trunk/crypto/camellia.c
@@ -1096,3 +1096,4 @@ module_exit(camellia_fini);
 
 MODULE_DESCRIPTION("Camellia Cipher Algorithm");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("camellia");