---

yaml --- r: 283297 b: refs/heads/master c: 2deed78 h: refs/heads/master i: 283295: 49c7eb4 v: v3
git-mirror · Nov 30, 2011 · 680115a · 680115a
1 parent e5babd2
commit 680115a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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 → trunk/crypto/serpent_generic.c b/trunk/crypto/serpent.c → trunk/crypto/serpent_generic.c