---

yaml --- r: 292263 b: refs/heads/master c: 075e39d h: refs/heads/master i: 292261: d65e829 292259: 740857f 292255: f78b5f6 v: v3
git-mirror · Mar 14, 2012 · 7f0ac33 · 7f0ac33
1 parent b78ed82
commit 7f0ac33
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1096,3 +1096,4 @@ module_exit(camellia_fini);
 
 MODULE_DESCRIPTION("Camellia Cipher Algorithm");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("camellia");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1096,3 +1096,4 @@ module_exit(camellia_fini);

		MODULE_DESCRIPTION("Camellia Cipher Algorithm");
		MODULE_LICENSE("GPL");
		MODULE_ALIAS("camellia");