summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/mach
diff options
context:
space:
mode:
authorKevin Hilman <khilman@mvista.com>2006-09-22 00:16:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-09-28 20:59:24 +0100
commit746140c71d537560bbd22c1b148fb21031c30e71 (patch)
treec9753521f7443f946b966d0e8bd19d60c71f99f9 /include/asm-arm/mach
parent82606c66e943227afcec8a3c7b8428b99a7f88b8 (diff)
downloadtalos-op-linux-746140c71d537560bbd22c1b148fb21031c30e71.tar.gz
talos-op-linux-746140c71d537560bbd22c1b148fb21031c30e71.zip
[ARM] 3855/1: Add generic time support
This patch adds Generic time-of-day support for the ARM architecture. The support is currently added using #ifdef's so that it can support sub-arches that do not (yet) have a clocksource added. As sub-arches add clocksource support, they should 'select GENERIC_TIME' Signed-off-by: Deepak Saxena <dsaxena@mvista.com> Signed-off-by: Daniel Walker <dwalker@mvista.com> Signed-off-by: Kevin Hilman <khilman@mvista.com> Acked-by: John Stultz <johnstul@us.ibm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/mach')
-rw-r--r--include/asm-arm/mach/time.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h
index dee0bc336fe8..1eb93f5c0d6c 100644
--- a/include/asm-arm/mach/time.h
+++ b/include/asm-arm/mach/time.h
@@ -38,7 +38,9 @@ struct sys_timer {
void (*init)(void);
void (*suspend)(void);
void (*resume)(void);
+#ifndef CONFIG_GENERIC_TIME
unsigned long (*offset)(void);
+#endif
#ifdef CONFIG_NO_IDLE_HZ
struct dyn_tick_timer *dyn_tick;
OpenPOWER on IntegriCloud