From 7ed363cd8d0a3e4fbe3c37b7458420f82ef9a106 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Wed, 26 Jul 2023 13:49:36 +0200 Subject: [PATCH] genpd: move owl-sps-helper.c from drivers/soc Moving only one of the two files in drivers/soc/actions to drivers/genpd caused a link failure in allmodconfig, as drivers/genpd is entered for compile testing, but drivers/soc/actions accidentally got skipped: x86_64-linux-gnu-ld: vmlinux.o: in function `owl_sps_set_power': owl-sps.c:(.text+0x16e259d): undefined reference to `owl_sps_set_pg' Move the other one as well to allow build testing to work correctly. Reported-by: Stephen Rothwell Signed-off-by: Arnd Bergmann --- drivers/genpd/actions/Makefile | 1 + drivers/{soc => genpd}/actions/owl-sps-helper.c | 0 drivers/soc/Makefile | 1 - drivers/soc/actions/Makefile | 3 --- 4 files changed, 1 insertion(+), 4 deletions(-) rename drivers/{soc => genpd}/actions/owl-sps-helper.c (100%) delete mode 100644 drivers/soc/actions/Makefile diff --git a/drivers/genpd/actions/Makefile b/drivers/genpd/actions/Makefile index e78c420a24540..7e8aa473d12d1 100644 --- a/drivers/genpd/actions/Makefile +++ b/drivers/genpd/actions/Makefile @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0+ +obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o obj-$(CONFIG_OWL_PM_DOMAINS) += owl-sps.o diff --git a/drivers/soc/actions/owl-sps-helper.c b/drivers/genpd/actions/owl-sps-helper.c similarity index 100% rename from drivers/soc/actions/owl-sps-helper.c rename to drivers/genpd/actions/owl-sps-helper.c diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index efdcd42f68cb3..708eaad8f590d 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -3,7 +3,6 @@ # Makefile for the Linux Kernel SOC specific device drivers. # -obj-$(CONFIG_ARCH_ACTIONS) += actions/ obj-y += apple/ obj-y += aspeed/ obj-$(CONFIG_ARCH_AT91) += atmel/ diff --git a/drivers/soc/actions/Makefile b/drivers/soc/actions/Makefile deleted file mode 100644 index 4ac88fec2050a..0000000000000 --- a/drivers/soc/actions/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ - -obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o -- 2.30.2