From 680115a207f25c2d34cbb7ebfb5528dc4278cb2c Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Wed, 23 Nov 2011 12:21:06 +0200 Subject: [PATCH] --- yaml --- r: 283297 b: refs/heads/master c: 2deed786d99390d5abe06a2a300d0643305bffcb h: refs/heads/master i: 283295: 49c7eb4b75addc79a373d0903231fb551a375e02 v: v3 --- [refs] | 2 +- trunk/crypto/Makefile | 2 -- trunk/crypto/{serpent.c => serpent_generic.c} | 0 3 files changed, 1 insertion(+), 3 deletions(-) rename trunk/crypto/{serpent.c => serpent_generic.c} (100%) diff --git a/[refs] b/[refs] index 0113243a9fae..cf0aa136ae15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f4e3e3fa5ba9fb54b280e959bc2a88c42eec76a +refs/heads/master: 2deed786d99390d5abe06a2a300d0643305bffcb diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile index 0e1f2aa7218e..f638063f4ea9 100644 --- a/trunk/crypto/Makefile +++ b/trunk/crypto/Makefile @@ -65,8 +65,6 @@ obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish_generic.o obj-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o - -serpent_generic-y := serpent.o obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o obj-$(CONFIG_CRYPTO_AES) += aes_generic.o obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o diff --git a/trunk/crypto/serpent.c b/trunk/crypto/serpent_generic.c similarity index 100% rename from trunk/crypto/serpent.c rename to trunk/crypto/serpent_generic.c