diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-29 18:20:17 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-30 22:11:22 +0800 |
commit | a7c58ac06224b83dba93eaafde88535d5da60aef (patch) | |
tree | b71357859f08f57f93c62130adf4debd1c42b87b /crypto/Makefile | |
parent | ddef482420b1ba8ec45e6123a7e8d3f67b21e5e3 (diff) | |
download | linux-stable-a7c58ac06224b83dba93eaafde88535d5da60aef.tar.gz linux-stable-a7c58ac06224b83dba93eaafde88535d5da60aef.tar.bz2 linux-stable-a7c58ac06224b83dba93eaafde88535d5da60aef.zip |
crypto: crc32 - Rename generic implementation
The generic crc32 implementation is currently called crc32. This
is a problem because it clashes with the lib implementation of crc32.
This patch renames the crypto crc32 to crc32_generic so that it is
consistent with crc32c. An alias for the driver is also added.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
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 ffe18c9c9bf4..059de1bb254b 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -100,7 +100,7 @@ obj-$(CONFIG_CRYPTO_POLY1305) += poly1305_generic.o obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_generic.o -obj-$(CONFIG_CRYPTO_CRC32) += crc32.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 |