diff options
| author | Chris Zankel <chris@zankel.net> | 2013-09-05 17:12:08 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2013-09-05 17:12:08 -0700 |
| commit | 4c2d6cb3bde307e7db8e95181cb66cf72ea5f253 (patch) | |
| tree | 751bd51f7ec26e0d752c1a974c3d6c9bfc0604cb /crypto/Makefile | |
| parent | 60c61f0d0919094cede7f96cf52cc79829b82e02 (diff) | |
| parent | 8c4fc164921ed8989d0e8a37d7669e5a81f7b44c (diff) | |
| download | linux-crypto-4c2d6cb3bde307e7db8e95181cb66cf72ea5f253.tar.gz linux-crypto-4c2d6cb3bde307e7db8e95181cb66cf72ea5f253.zip | |
Merge tag 'v3.11' into for_next
Update Xtensa tree to Linux 3.11 (merging)
Diffstat (limited to 'crypto/Makefile')
| -rw-r--r-- | crypto/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index 2d5ed08a..2ba0df2f 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -83,7 +83,6 @@ 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_CRCT10DIF) += crct10dif.o obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o obj-$(CONFIG_CRYPTO_LZO) += lzo.o obj-$(CONFIG_CRYPTO_LZ4) += lz4.o |