Skip to content

Commit 32cdf41

Browse files
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>
2 parents ca8f96f + a1b20e0 commit 32cdf41

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/arm/mach-rockchip/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ config ARCH_ROCKCHIP
1313
select HAVE_ARM_SCU if SMP
1414
select HAVE_ARM_TWD if SMP
1515
select DW_APB_TIMER_OF
16-
select REGULATOR if PM
16+
select REGULATOR
1717
select ROCKCHIP_TIMER
1818
select ARM_GLOBAL_TIMER
1919
select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK

0 commit comments

Comments
 (0)