summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-22 14:11:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-22 14:11:36 -0800
commit4aa364443d023fab08c9dd4fe6785e8b73f6eaeb (patch)
tree568ce85c573af7fab4801248b97adaee3f0f7dd5 /arch/arm
parentc9584234709aff90fbf38f71904a068ee9e8bce3 (diff)
parent8acb54abc1db4e1e3913359e4108e04e88ce4d92 (diff)
downloadlinux-4aa364443d023fab08c9dd4fe6785e8b73f6eaeb.tar.bz2
Merge tag 'timers-urgent-2021-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner: "A small set of clockevent fixes which fell through the cracks before the 5.11 release: - Ensure a clock is enabled on sh_cmt - Trivial compile fail and compile warning fixes" * tag 'timers-urgent-2021-02-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource/drivers/mxs_timer: Add missing semicolon when DEBUG is defined clocksource/drivers/sh_cmt: Make sure channel clock supply is enabled clocksource/drivers/ixp4xx: Select TIMER_OF when needed
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ixp4xx/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index f7211b57b1e7..165c184801e1 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -13,7 +13,6 @@ config MACH_IXP4XX_OF
select I2C
select I2C_IOP3XX
select PCI
- select TIMER_OF
select USE_OF
help
Say 'Y' here to support Device Tree-based IXP4xx platforms.