aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2012-03-05 20:26:32 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2012-03-14 17:25:55 +0800
commit075e39df6718503d98d63a3f392ad53f81d3077a (patch)
tree2ce1f1b123b47f8768beb0794f881c4e3bf068ef /crypto
parent4de5933780f897b89e4863fa545c08a086325353 (diff)
downloadlinux-linaro-stable-075e39df6718503d98d63a3f392ad53f81d3077a.tar.gz
crypto: camellia - rename camellia module to camellia_generic
Rename camellia module to camellia_generic to allow optimized assembler implementations to autoload with module-alias. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Makefile3
-rw-r--r--crypto/camellia.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index f638063f4ea9..43559438ca51 100644
--- a/crypto/Makefile
+++ b/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/crypto/camellia.c b/crypto/camellia.c
index 7ae4bcddd1de..f07a19b3caad 100644
--- a/crypto/camellia.c
+++ b/crypto/camellia.c
@@ -1096,3 +1096,4 @@ module_exit(camellia_fini);
MODULE_DESCRIPTION("Camellia Cipher Algorithm");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("camellia");