diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 18:57:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 18:57:38 -0700 |
commit | 260eddf4391f162a69d1d163729249635fa7a78f (patch) | |
tree | 56800d02133c839b26a74f203918c2d68cb0ce7c /crypto/Makefile | |
parent | f2d9c740f6b9f92608dfb2a2bdd797e0350cabe4 (diff) | |
parent | 7890ea1f95fa8968fa6f5bb5860e6632932abfd3 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
Revert crypto: prng - Deterministic CPRNG
Diffstat (limited to 'crypto/Makefile')
-rw-r--r-- | crypto/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index ef61b3b64660..d4f3ed857df0 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -69,7 +69,7 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o obj-$(CONFIG_CRYPTO_LZO) += lzo.o -obj-$(CONFIG_CRYPTO_PRNG) += prng.o + obj-$(CONFIG_CRYPTO_TEST) += tcrypt.o # |