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 | 1f6aed0491f135be944e25b88f11e0ce6e777899 (patch) | |
| tree | 6eea7717a9f6a392f1b1066604618446187dc9f4 /crypto/Makefile | |
| parent | a1b1d30209fc27a8cfa2264804298779e5919219 (diff) | |
| parent | 0f4918a48efbb743bb3b6dd3dacd7609fdd43327 (diff) | |
| download | linux-crypto-1f6aed0491f135be944e25b88f11e0ce6e777899.tar.gz linux-crypto-1f6aed0491f135be944e25b88f11e0ce6e777899.zip | |
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 '')
| -rw-r--r-- | crypto/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index ef61b3b6..d4f3ed85 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 # |