diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-08-11 16:14:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-08-29 10:44:54 +0200 |
| commit | d11277c35e1a2a3a4ace05d1a4f79eee92b76a2f (patch) | |
| tree | f93811f6867410e9ae71ef3075bde9af84dd91af /arch/arm/configs | |
| parent | e92ab51026ae1616697c21bb86c2b821856c0ea3 (diff) | |
| download | linux-stable-d11277c35e1a2a3a4ace05d1a4f79eee92b76a2f.tar.gz linux-stable-d11277c35e1a2a3a4ace05d1a4f79eee92b76a2f.tar.bz2 linux-stable-d11277c35e1a2a3a4ace05d1a4f79eee92b76a2f.zip | |
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 <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v4t_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v5_defconfig | 1 |
2 files changed, 0 insertions, 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 |