summaryrefslogtreecommitdiff
path: root/arch/arm/mach-bcm/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-07-25 12:16:16 +0200
committerIngo Molnar <mingo@kernel.org>2020-07-25 12:16:16 +0200
commitfb4405ae6e1c66277b7d69d2c7a34215671da585 (patch)
tree95a24efe3a3ca90a4b041d5ca548c2d37eac1ae8 /arch/arm/mach-bcm/Kconfig
parentc9a1ff316bc9b1d1806a4366d0aef6e18833ba52 (diff)
parentba47d845d715a010f7b51f6f89bae32845e6acb7 (diff)
Merge tag 'v5.8-rc6' into x86/cpu, to refresh the branch before adding new commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-bcm/Kconfig')
-rw-r--r--arch/arm/mach-bcm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 6aa938b949db..1df0ee01ee02 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -53,6 +53,7 @@ config ARCH_BCM_NSP
select ARM_ERRATA_754322
select ARM_ERRATA_775420
select ARM_ERRATA_764369 if SMP
+ select ARM_TIMER_SP804
select THERMAL
select THERMAL_OF
help