Commit 5ac1ba05 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents b2162363 7ed363cd

drivers/genpd/actions/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0+

obj-$(CONFIG_OWL_PM_DOMAINS_HELPER)	+= owl-sps-helper.o

obj-$(CONFIG_OWL_PM_DOMAINS)		+= owl-sps.o

drivers/soc/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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/

drivers/soc/actions/Makefile

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0+



obj-$(CONFIG_OWL_PM_DOMAINS_HELPER) += owl-sps-helper.o