diff --git a/[refs] b/[refs]
index f52d09c353b3..0549f7d42e5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2861a71c0cb582e8c190612bbdc726966f0981a
+refs/heads/master: 617ae7c7a1ac04c1d3e4b22add6dfb53b0fd0675
diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
index 43559438ca51..30f33d675330 100644
--- a/trunk/crypto/Makefile
+++ b/trunk/crypto/Makefile
@@ -67,7 +67,6 @@ 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
-camellia_generic-y = camellia.o
 obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia_generic.o
 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
 obj-$(CONFIG_CRYPTO_CAST6) += cast6.o
diff --git a/trunk/crypto/camellia.c b/trunk/crypto/camellia_generic.c
similarity index 100%
rename from trunk/crypto/camellia.c
rename to trunk/crypto/camellia_generic.c