diff options
author | Sudeep Holla <sudeep.holla@arm.com> | 2015-05-29 12:27:46 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-02 09:58:19 +0100 |
commit | e44d89f14227ffa5e96cd158fb2d35fbb40fa97a (patch) | |
tree | 6526dc232a001c0a9e2e6999ca84a0dd7c158f8e | |
parent | 0b7402dce445ba0d11401c2cb806e8fc260c9e49 (diff) | |
download | blackbird-obmc-linux-e44d89f14227ffa5e96cd158fb2d35fbb40fa97a.tar.gz blackbird-obmc-linux-e44d89f14227ffa5e96cd158fb2d35fbb40fa97a.zip |
ARM: 8382/1: clocksource: make ARM_TIMER_SP804 depend on GENERIC_SCHED_CLOCK
Commit 5261ef2ea836 ("ARM: 8366/1: move Dual-Timer SP804 driver to
drivers/clocksource") moved SP804 to drivers/clocksource resulting in
it being selectable on platforms/architectures without the config
GENERIC_SCHED_CLOCK enabled. Due to that, it results in the following
build failure(e.g. x86_64 allmodconfig)
drivers/built-in.o: In function `__sp804_clocksource_and_sched_clock_init':
(.init.text+0x1a0e7): undefined reference to `sched_clock_register'
This patch fixes the build by making ARM_TIMER_SP804 depend on
GENERIC_SCHED_CLOCK
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-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 0f1c0e7f86da..50534704486a 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -134,6 +134,7 @@ config ARM_GLOBAL_TIMER config ARM_TIMER_SP804 bool "Support for Dual Timer SP804 module" + depends on GENERIC_SCHED_CLOCK select CLKSRC_MMIO select CLKSRC_OF if OF |