diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-15 21:58:50 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 11:16:00 +0000 |
| commit | 0af85dda39d9b673aca8c0ebae004ea70f3efc93 (patch) | |
| tree | a3fad536f3c5cb4e91291efeb26eca93c2f37fd2 /arch/arm/plat-versatile | |
| parent | 1da0c89c66753860ccfe81eb327c25db46c2a24a (diff) | |
| download | linux-0af85dda39d9b673aca8c0ebae004ea70f3efc93.tar.gz linux-0af85dda39d9b673aca8c0ebae004ea70f3efc93.tar.bz2 linux-0af85dda39d9b673aca8c0ebae004ea70f3efc93.zip | |
ARM: vexpress: add sched_clock() for Versatile Express
Add a sched_clock() implementation to Versatile Express using the new
sched_clock() infrastructure for extending 32bit counters to full
64-bit nanoseconds.
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-versatile')
| -rw-r--r-- | arch/arm/plat-versatile/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile index 5cf88e8427b1..8bb6ba6d3572 100644 --- a/arch/arm/plat-versatile/Makefile +++ b/arch/arm/plat-versatile/Makefile @@ -1,7 +1,8 @@ obj-y := clock.o obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o -obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o -obj-$(CONFIG_ARCH_VERSATILE) += sched-clock.o +ifneq ($(CONFIG_ARCH_INTEGRATOR),y) +obj-y += sched-clock.o +endif ifeq ($(CONFIG_LEDS_CLASS),y) obj-$(CONFIG_ARCH_REALVIEW) += leds.o obj-$(CONFIG_ARCH_VERSATILE) += leds.o |