From: Anders Roxell Date: Wed, 27 May 2020 11:26:07 +0000 (+0200) Subject: power: reset: vexpress: fix build issue X-Git-Tag: v5.8-rc1~140^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0c7dc1739692888c6ea271fde7a4a69a31945c7;p=thirdparty%2Fkernel%2Flinux.git power: reset: vexpress: fix build issue An allmodconfig kernel makes CONFIG_VEXPRESS_CONFIG a module and CONFIG_POWER_RESET_VEXPRESS builtin. That makes us see this build error: aarch64-linux-gnu-ld: drivers/power/reset/vexpress-poweroff.o: in function `vexpress_reset_probe': ../drivers/power/reset/vexpress-poweroff.c:119: undefined reference to `devm_regmap_init_vexpress_config' ../drivers/power/reset/vexpress-poweroff.c:119:(.text+0x48c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `devm_regmap_init_vexpress_config' make[1]: *** [/srv/src/kernel/next/Makefile:1126: vmlinux] Error 1 Rework so that POWER_RESET_VEXPRESS depends on 'VEXPRESS_CONFIG=y'. Link: https://lore.kernel.org/r/20200527112608.3886105-5-anders.roxell@linaro.org Fixes: d06cfe3f123c ("bus: vexpress-config: Merge vexpress-syscfg into vexpress-config") Signed-off-by: Anders Roxell Acked-by: Rob Herring Signed-off-by: Arnd Bergmann --- diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index 8903803020805..df479c49be490 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -184,7 +184,7 @@ config POWER_RESET_VERSATILE config POWER_RESET_VEXPRESS bool "ARM Versatile Express power-off and reset driver" depends on ARM || ARM64 - depends on VEXPRESS_CONFIG + depends on VEXPRESS_CONFIG=y help Power off and reset support for the ARM Ltd. Versatile Express boards.