]> Gentwo Git Trees - linux/.git/commit
Merge tag 'v6.18-rockchip-arm32-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Tue, 23 Sep 2025 21:06:28 +0000 (23:06 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 23 Sep 2025 21:06:32 +0000 (23:06 +0200)
commit32cdf411b4f8c23f6a5e6d897a64d1501dfaaee3
tree5e8c9cc1d8f3c43c84ac212637941435bab2f5d4
parentca8f96ffe67fa97b39ac56cec8acbe87cec299f7
parenta1b20e062245571c128ec521c4df56ad1bff9bd0
Merge tag 'v6.18-rockchip-arm32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/arm

Commit d1bef995f61a ("ARM: rockchip: force built-in regulator support for PM")
introduced the REGULATOR if PM dependency for the suspend code, while
commit d1558dfd9f22 ("ARM: rockchip: Force CONFIG_PM on Rockchip systems")
later always enabled PM.

So we can simplify the REGULATOR dependency by dropping the if PM.

* tag 'v6.18-rockchip-arm32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: remove REGULATOR conditional to PM

Link: https://lore.kernel.org/r/6025175.zQ0Gbyo6oJ@diego
Signed-off-by: Arnd Bergmann <arnd@arndb.de>