From: Eric Biggers <ebiggers@xxxxxxxxxx> Since crc32_generic.c and crc32c_generic.c now expose both the generic and architecture-optimized implementations via the crypto_shash API, rather than just the generic implementations as they originally did, remove the "_generic" part of the filenames. Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx> --- crypto/Makefile | 8 ++++---- crypto/{crc32_generic.c => crc32.c} | 0 crypto/{crc32c_generic.c => crc32c.c} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename crypto/{crc32_generic.c => crc32.c} (100%) rename crypto/{crc32c_generic.c => crc32c.c} (100%) diff --git a/crypto/Makefile b/crypto/Makefile index 0e6ab5ffd3f77..c073a4967dc2a 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -150,14 +150,14 @@ obj-$(CONFIG_CRYPTO_SEED) += seed.o obj-$(CONFIG_CRYPTO_ARIA) += aria_generic.o obj-$(CONFIG_CRYPTO_CHACHA20) += chacha_generic.o 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_generic.o -CFLAGS_crc32c_generic.o += -DARCH=$(ARCH) -CFLAGS_crc32_generic.o += -DARCH=$(ARCH) +obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o +obj-$(CONFIG_CRYPTO_CRC32) += crc32.o +CFLAGS_crc32c.o += -DARCH=$(ARCH) +CFLAGS_crc32.o += -DARCH=$(ARCH) obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o obj-$(CONFIG_CRYPTO_KRB5ENC) += krb5enc.o obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o obj-$(CONFIG_CRYPTO_LZ4) += lz4.o obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o diff --git a/crypto/crc32_generic.c b/crypto/crc32.c similarity index 100% rename from crypto/crc32_generic.c rename to crypto/crc32.c diff --git a/crypto/crc32c_generic.c b/crypto/crc32c.c similarity index 100% rename from crypto/crc32c_generic.c rename to crypto/crc32c.c base-commit: 56f944529ec2292cbe63377a76df3759d702dd39 -- 2.49.0