From d11277c35e1a2a3a4ace05d1a4f79eee92b76a2f Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 11 Aug 2022 16:14:13 +0200 Subject: [PATCH] ARM: defconfig: clean up multi_v4t and multi_v5 configs Integrator now selects the regulators and versatile selects the reset driver, so the correspondig options can be dropped from the defconfig files. Fixes: d2854bbe5f5c ("ARM: integrator: Add some Kconfig selections") Fixes: 1c6e288da6cc ("ARM: versatile: move restart to the device tree") Reviewed-by: Linus Walleij Signed-off-by: Arnd Bergmann --- arch/arm/configs/multi_v4t_defconfig | 2 -- arch/arm/configs/multi_v5_defconfig | 1 - 2 files changed, 3 deletions(-) diff --git a/arch/arm/configs/multi_v4t_defconfig b/arch/arm/configs/multi_v4t_defconfig index 6c3e45b71ab5..e2fd822f741a 100644 --- a/arch/arm/configs/multi_v4t_defconfig +++ b/arch/arm/configs/multi_v4t_defconfig @@ -71,8 +71,6 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_WATCHDOG=y CONFIG_GPIO_WATCHDOG=y CONFIG_AT91RM9200_WATCHDOG=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y CONFIG_FB=y CONFIG_FB_CLPS711X=y diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index 5f3ed81228b0..a65f32a78885 100644 --- a/arch/arm/configs/multi_v5_defconfig +++ b/arch/arm/configs/multi_v5_defconfig @@ -149,7 +149,6 @@ CONFIG_SPI_SUN6I=y CONFIG_GPIO_ASPEED=m CONFIG_GPIO_ASPEED_SGPIO=y CONFIG_GPIO_MXC=y -CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_QNAP=y CONFIG_SENSORS_ADT7475=y