From 7f0ac33226ce95d283700c424ea3151010aaa885 Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Mon, 5 Mar 2012 20:26:32 +0200 Subject: [PATCH] --- yaml --- r: 292263 b: refs/heads/master c: 075e39df6718503d98d63a3f392ad53f81d3077a h: refs/heads/master i: 292261: d65e8298d66f9adb1ec1753276dca0f338ca2d66 292259: 740857fc3b2c5ca3762279aeb94f76d303676956 292255: f78b5f6540dd1a05876ceb1321aae335449da8b8 v: v3 --- [refs] | 2 +- trunk/crypto/Makefile | 3 ++- trunk/crypto/camellia.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) 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");