aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/include
diff options
context:
space:
mode:
authorjohn stultz <johnstul@us.ibm.com>2009-05-01 13:10:28 -0700
committerPaul Mundt <lethal@linux-sh.org>2009-05-03 17:32:55 +0900
commit7563431107f6debf57c1dbecfb9498cf31a1c036 (patch)
tree50e473f8eb90069b6e64675ee582dd3be76fbaef /arch/sh/include
parentd80498398276ca8eee7ebdbe0d47e06d01317439 (diff)
time: sh: convert to use arch_getoffset() infrastructure
Convert sh to use GENERIC_TIME via the arch_getoffset() infrastructure. Signed-off-by: John Stultz <johnstul@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
-rw-r--r--arch/sh/include/asm/timer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/timer.h b/arch/sh/include/asm/timer.h
index 8f80a55c04a..9c968d19cb9 100644
--- a/arch/sh/include/asm/timer.h
+++ b/arch/sh/include/asm/timer.h
@@ -9,7 +9,7 @@ struct sys_timer_ops {
int (*init)(void);
int (*start)(void);
int (*stop)(void);
-#ifndef CONFIG_GENERIC_TIME
+#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
unsigned long (*get_offset)(void);
#endif
};
@@ -26,7 +26,7 @@ struct sys_timer {
extern struct sys_timer tmu_timer, mtu2_timer;
extern struct sys_timer *sys_timer;
-#ifndef CONFIG_GENERIC_TIME
+#ifdef CONFIG_ARCH_USES_GETTIMEOFFSET
static inline unsigned long get_timer_offset(void)
{
return sys_timer->ops->get_offset();