diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 12:15:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 12:15:21 -0400 |
| commit | 0d2ecee2bdb2a19d04bc5cefac0f86e790f1aad4 (patch) | |
| tree | 2e0f08819a57e2c191f6e7fe2b2cd2f2415143bd /drivers/crypto/Makefile | |
| parent | 3ae2a1ce2e7b70254e5c9e465adefac9cba191d6 (diff) | |
| parent | f07ef1de9baeb2add514c51f59d4bc3c659c2ca4 (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:
crypto: tcrypt - do not attempt to write to readonly variable
random: update interface comments to reflect reality
crypto: picoxcell - add support for the picoxcell crypto engines
crypto: sha1 - Add test vector to test partial block processing
hwrng: omap - Convert release_resource to release_region/release_mem_region
crypto: aesni-intel - Fix remaining leak in rfc4106_set_hash_key
crypto: omap-sham - don't treat NULL clk as an error
crypto: omap-aes - don't treat NULL clk as an error
crypto: testmgr - mark ghash as fips_allowed
crypto: testmgr - mark xts(aes) as fips_allowed
crypto: skcipher - remove redundant NULL check
hwrng: pixocell - add support for picoxcell TRNG
crypto: aesni-intel - Don't leak memory in rfc4106_set_hash_subkey
Diffstat (limited to 'drivers/crypto/Makefile')
| -rw-r--r-- | drivers/crypto/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index 256697330a4..5203e34248d 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile | |||
| @@ -10,4 +10,4 @@ obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o | |||
| 10 | obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/ | 10 | obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/ |
| 11 | obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o | 11 | obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o |
| 12 | obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o | 12 | obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o |
| 13 | 13 | obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o | |