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/mini2440_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch/arm/configs/mini2440_defconfig') diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig index 3ef48e79b410..4da0055409e5 100644 --- a/arch/arm/configs/mini2440_defconfig +++ b/arch/arm/configs/mini2440_defconfig @@ -3,7 +3,6 @@ CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y -# CONFIG_COMPAT_BRK is not set CONFIG_ARCH_MULTI_V4T=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_S3C24XX=y @@ -19,7 +18,6 @@ CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set CONFIG_BLK_DEV_INTEGRITY=y CONFIG_PARTITION_ADVANCED=y CONFIG_BSD_DISKLABEL=y @@ -28,6 +26,7 @@ CONFIG_SOLARIS_X86_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_LDM_PARTITION=y CONFIG_BINFMT_MISC=m +# CONFIG_COMPAT_BRK is not set CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -104,6 +103,7 @@ CONFIG_SCSI=m # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_SG=m +# CONFIG_BLK_DEV_BSG is not set # CONFIG_SCSI_LOWLEVEL is not set CONFIG_NETDEVICES=y CONFIG_TUN=m @@ -330,8 +330,8 @@ CONFIG_FONT_8x8=y CONFIG_FONT_MINI_4x6=y CONFIG_DEBUG_INFO=y # CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_DEBUG_KERNEL=y CONFIG_STRIP_ASM_SYMS=y CONFIG_DEBUG_FS=y -CONFIG_DEBUG_KERNEL=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_USER=y -- cgit v1.2.3