From 2002f3968714e5426fa97399b24fac3db66a7f06 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 20 Jul 2022 14:47:57 +0200 Subject: ARM: refresh defconfig files A lot of Kconfig options have changed over the years, and we tend to not do a blind 'make defconfig' to refresh the files, to ensure we catch options that should not have gone away. I used some a bit of scripting to only rework the bits where an option moved around in any of the defconfig files, without also dropping any of the other lines, to make it clearer which options we no longer have. Reviewed-by: Krzysztof Kozlowski Acked-by: Nicolas Ferre Acked-by: Neil Armstrong Acked-by: Sudeep Holla Acked-by: Gregory CLEMENT Signed-off-by: Arnd Bergmann --- arch/arm/configs/nhk8815_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/arm/configs/nhk8815_defconfig') diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index 907d6512821a..1d0e47b2ae32 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig @@ -1,5 +1,4 @@ # CONFIG_LOCALVERSION_AUTO is not set -# CONFIG_SWAP is not set CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y @@ -10,14 +9,14 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y CONFIG_KALLSYMS_ALL=y -CONFIG_SLAB=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_NOMADIK=y CONFIG_MACH_NOMADIK_8815NHK=y CONFIG_AEABI=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set +# CONFIG_SWAP is not set +CONFIG_SLAB=y CONFIG_CMA=y CONFIG_NET=y CONFIG_PACKET=y @@ -59,6 +58,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y +# CONFIG_BLK_DEV_BSG is not set CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SCAN_ASYNC=y -- cgit v1.2.3