From: Eric Biggers <ebiggers@xxxxxxxxxx> All modules that need CONFIG_CRC4 already select it, so there is no need to bother users about the option. Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx> --- arch/s390/configs/debug_defconfig | 1 - arch/s390/configs/defconfig | 1 - lib/Kconfig | 7 +------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig index d6beec5292a00..c46781f8570c1 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -813,11 +813,10 @@ CONFIG_CRYPTO_PAES_S390=m CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_CORDIC=m CONFIG_CRYPTO_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRC4=m CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_RANDOM32_SELFTEST=y CONFIG_XZ_DEC_MICROLZMA=y CONFIG_DMA_CMA=y diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index 8cfbfb10bba8c..23d8bce642aa4 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -801,11 +801,10 @@ CONFIG_CRYPTO_DEV_VIRTIO=m CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_CORDIC=m CONFIG_PRIME_NUMBERS=m CONFIG_CRYPTO_LIB_CURVE25519=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m -CONFIG_CRC4=m CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_XZ_DEC_MICROLZMA=y CONFIG_DMA_CMA=y CONFIG_CMA_SIZE_MBYTES=0 diff --git a/lib/Kconfig b/lib/Kconfig index 67bbf4f64dd98..e867971c97669 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -207,16 +207,11 @@ config ARCH_HAS_CRC64 config CRC64_ARCH tristate default CRC64 if ARCH_HAS_CRC64 && CRC_OPTIMIZATIONS config CRC4 - tristate "CRC4 functions" - help - This option is provided for the case where no in-kernel-tree - modules require CRC4 functions, but a module built outside - the kernel tree does. Such modules that use library CRC4 - functions require M here. + tristate config CRC7 tristate "CRC7 functions" help This option is provided for the case where no in-kernel-tree -- 2.48.1
