summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Redfearn <matt.redfearn@imgtec.com>2017-07-18 10:25:39 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2017-08-11 12:53:29 +0200
commit599dc457c79bde8bd4fe8bbb2ba1f30ef3d7a5c8 (patch)
tree16414569e25aac67bb88195283c57e62cc6de7ea
parentclocksource/drivers/timer-of: Checking for IS_ERR() instead of NULL (diff)
downloadlinux-599dc457c79bde8bd4fe8bbb2ba1f30ef3d7a5c8.tar.xz
linux-599dc457c79bde8bd4fe8bbb2ba1f30ef3d7a5c8.zip
clocksource/drivers/Kconfig: Fix CLKSRC_PISTACHIO dependencies
In v4.13, CLKSRC_PISTACHIO can select TIMER_OF on architectures without GENERIC_CLOCKEVENTS, resulting in a struct clock_event_device missing some required features and build breakage compiling timer_of.c. One of the symbols selecting TIMER_OF is CLKSRC_PISTACHIO, so add the dependency on GENERIC_CLOCKEVENTS. Thanks to kbuild test robot for finding this error (https://lkml.org/lkml/2017/7/16/249) Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com> Suggested-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r--drivers/clocksource/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index fcae5ca6ac92..54a67f8a28eb 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -262,7 +262,7 @@ config CLKSRC_LPC32XX
config CLKSRC_PISTACHIO
bool "Clocksource for Pistachio SoC" if COMPILE_TEST
- depends on HAS_IOMEM
+ depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
select TIMER_OF
help
Enables the clocksource for the Pistachio SoC.