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
This commit is contained in:
Arnd Bergmann 2023-07-26 14:41:29 +02:00
commit 5ac1ba0552
4 changed files with 1 additions and 5 deletions

View File

@ -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

View File

@ -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/

View File

@ -1,3 +0,0 @@
# SPDX-License-Identifier: GPL-2.0+
obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o