From abfb5e6a239598bf230fe04bb3ae17ff9ce5a663 Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Mon, 5 Mar 2012 20:26:42 +0200 Subject: [PATCH] --- yaml --- r: 292265 b: refs/heads/master c: 617ae7c7a1ac04c1d3e4b22add6dfb53b0fd0675 h: refs/heads/master i: 292263: 7f0ac33226ce95d283700c424ea3151010aaa885 v: v3 --- [refs] | 2 +- trunk/crypto/Makefile | 1 - trunk/crypto/{camellia.c => camellia_generic.c} | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename trunk/crypto/{camellia.c => camellia_generic.c} (100%) 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