diff options
| author | James Morris <james.l.morris@oracle.com> | 2013-03-11 12:54:48 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2013-03-11 12:54:48 +1100 |
| commit | ae3fa576302633290c8d7c394c4098ec027bd8a1 (patch) | |
| tree | 51a6d97b1ef57be7cb16c797497a610b9e1e1a5d /crypto/Makefile | |
| parent | ca10c662b0ec80db86864277a94889cc63bae958 (diff) | |
| parent | a390f39a9ef577563398884870a50eba558dfe49 (diff) | |
| download | linux-crypto-ae3fa576302633290c8d7c394c4098ec027bd8a1.tar.gz linux-crypto-ae3fa576302633290c8d7c394c4098ec027bd8a1.zip | |
Merge tag 'v3.9-rc2' into next
Sync with Linus.
Linux 3.9-rc2
Diffstat (limited to 'crypto/Makefile')
| -rw-r--r-- | crypto/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index d59dec74..be1a1beb 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -81,6 +81,7 @@ obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o obj-$(CONFIG_CRYPTO_ZLIB) += zlib.o obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o +obj-$(CONFIG_CRYPTO_CRC32) += crc32.o obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o obj-$(CONFIG_CRYPTO_LZO) += lzo.o obj-$(CONFIG_CRYPTO_842) += 842.o |