diff options
| author | James Morris <james.morris@microsoft.com> | 2019-03-26 16:28:01 -0700 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-03-26 16:28:01 -0700 |
| commit | 0d79d47e75b64925d32d790a0907fbbaeb16cf1a (patch) | |
| tree | 92cc49cb728ae789fcf1306a4a36206cd0f7a098 /crypto/Makefile | |
| parent | aaf6aed3ef1a735e34339a51f26f5f3e5fe9a478 (diff) | |
| parent | 1d5d6bd2502dff39b91d2280711ecbf86c1287a8 (diff) | |
| download | linux-crypto-0d79d47e75b64925d32d790a0907fbbaeb16cf1a.tar.gz linux-crypto-0d79d47e75b64925d32d790a0907fbbaeb16cf1a.zip | |
Merge tag 'v5.1-rc2' into next-general
Merge to Linux 5.1-rc2 for subsystems to work with.
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 799ed5e9..fb5bf2a3 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -128,7 +128,7 @@ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_generic.o obj-$(CONFIG_CRYPTO_CRC32) += crc32_generic.o obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif_common.o crct10dif_generic.o obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o -obj-$(CONFIG_CRYPTO_LZO) += lzo.o +obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o obj-$(CONFIG_CRYPTO_LZ4) += lz4.o obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o obj-$(CONFIG_CRYPTO_842) += 842.o |