Commit 32cdf41
committed
Merge tag 'v6.18-rockchip-arm32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/arm
Commit d1bef99 ("ARM: rockchip: force built-in regulator support for PM")
introduced the REGULATOR if PM dependency for the suspend code, while
commit d1558df ("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>1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
0 commit comments