diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-07-26 14:41:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-07-26 14:41:35 +0200 |
| commit | 5ac1ba055215bf79d53ce3deded68f6510f46c24 (patch) | |
| tree | a2bac6b20ce4a516473674a2093ba7fa4315b203 | |
| parent | b2162363c11ed99af7cedbbec2732329c97e4226 (diff) | |
| parent | 7ed363cd8d0a3e4fbe3c37b7458420f82ef9a106 (diff) | |
Merge branch 'drivers/genpd' into soc/drivers
Two build regressions came up that I added fixes for
* drivers/genpd:
genpd: move owl-sps-helper.c from drivers/soc
soc: starfive: remove stale Makefile entry
| -rw-r--r-- | drivers/genpd/actions/Makefile | 1 | ||||
| -rw-r--r-- | drivers/genpd/actions/owl-sps-helper.c (renamed from drivers/soc/actions/owl-sps-helper.c) | 0 | ||||
| -rw-r--r-- | drivers/soc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/soc/actions/Makefile | 3 |
4 files changed, 1 insertions, 5 deletions
diff --git a/drivers/genpd/actions/Makefile b/drivers/genpd/actions/Makefile index e78c420a2454..7e8aa473d12d 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 index e3f36603dd53..e3f36603dd53 100644 --- a/drivers/soc/actions/owl-sps-helper.c +++ b/drivers/genpd/actions/owl-sps-helper.c diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 3b0f9fb3b5c8..708eaad8f590 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/ @@ -29,7 +28,6 @@ obj-y += renesas/ obj-y += rockchip/ obj-$(CONFIG_SOC_SAMSUNG) += samsung/ obj-y += sifive/ -obj-$(CONFIG_SOC_STARFIVE) += starfive/ obj-y += sunxi/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-y += ti/ diff --git a/drivers/soc/actions/Makefile b/drivers/soc/actions/Makefile deleted file mode 100644 index 4ac88fec2050..000000000000 --- 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 |