diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-02-22 10:59:13 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2021-02-22 10:59:13 +0100 |
| commit | 8acb54abc1db4e1e3913359e4108e04e88ce4d92 (patch) | |
| tree | 77902ddf57c9d4d7e7e4339d4d6a2028d580e966 /drivers/clocksource/Kconfig | |
| parent | 92bf22614b21a2706f4993b278017e437f7785b3 (diff) | |
| parent | 7da390694afbaed8e0f05717a541dfaf1077ba51 (diff) | |
Merge tag 'timers-v5.11-rc5' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Pull clockevent fixes from Daniel Lezcano
- Fix harmless warning with the ixp4xx when the TIMER_OF option is not
selected (Arnd Bergmann)
- Make sure channel clock supply is enabled on sh_cmt (Geert Uytterhoeven)
- Fix compilation error when DEBUG is defined with the mxs_timer (Tom Rix)
Link: https://lore.kernel.org/r/ae3bcda6-5180-639d-6246-d2dfd271c3e7@linaro.org
Diffstat (limited to 'drivers/clocksource/Kconfig')
| -rw-r--r-- | drivers/clocksource/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 14c7c4712478..66be9ea69e33 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -79,6 +79,7 @@ config IXP4XX_TIMER bool "Intel XScale IXP4xx timer driver" if COMPILE_TEST depends on HAS_IOMEM select CLKSRC_MMIO + select TIMER_OF if OF help Enables support for the Intel XScale IXP4xx SoC timer. |