summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2012-03-05 19:26:42 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2012-03-14 10:25:55 +0100
commit617ae7c7a1ac04c1d3e4b22add6dfb53b0fd0675 (patch)
treea0ace4561dbd98931527802ce5d1cf459c4af130 /crypto
parentcrypto: camellia - fix checkpatch warnings (diff)
downloadlinux-617ae7c7a1ac04c1d3e4b22add6dfb53b0fd0675.tar.xz
linux-617ae7c7a1ac04c1d3e4b22add6dfb53b0fd0675.zip
crypto: camellia - rename camellia.c to camellia_generic.c
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/Makefile1
-rw-r--r--crypto/camellia_generic.c (renamed from crypto/camellia.c)0
2 files changed, 0 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index 43559438ca51..30f33d675330 100644
--- a/crypto/Makefile
+++ b/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/crypto/camellia.c b/crypto/camellia_generic.c
index f7aaaaf86982..f7aaaaf86982 100644
--- a/crypto/camellia.c
+++ b/crypto/camellia_generic.c