summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2020-05-27 13:26:06 +0200
committerArnd Bergmann <arnd@arndb.de>2020-05-28 12:30:33 +0200
commit56f292ad66321ec2b06fbbe8a4ac5d520257fb41 (patch)
tree9e86fb93c4344bf4babb15538e974226fc7273e4
parentMerge tag 'v5.8-rockchip-soc32-1' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadlinux-56f292ad66321ec2b06fbbe8a4ac5d520257fb41.tar.xz
linux-56f292ad66321ec2b06fbbe8a4ac5d520257fb41.zip
Revert "ARM: vexpress: Don't select VEXPRESS_CONFIG"
This reverts commit 848685c25da99d871bbd87369f3c3d6eead661ac. Due to when I set 'depends on VEXPRESS_CONFOG=Y' in 'config POWER_RESET_VEXPRESS' to get an allmodconfig build on arm64 to build, and allmodconfig build on arm fails if this patch isn't reverted. Link: https://lore.kernel.org/r/20200527112608.3886105-4-anders.roxell@linaro.org Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/mach-vexpress/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 8391a5b3cd78..065e12991663 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -19,6 +19,7 @@ menuconfig ARCH_VEXPRESS
select POWER_SUPPLY
select REGULATOR if MMC_ARMMMCI
select REGULATOR_FIXED_VOLTAGE if REGULATOR
+ select VEXPRESS_CONFIG
help
This option enables support for systems using Cortex processor based
ARM core and logic (FPGA) tiles on the Versatile Express motherboard,