aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/hp300/config.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-11-08 11:34:55 -0700
committerStephen Warren <swarren@nvidia.com>2012-12-24 09:36:34 -0700
commitc8d5ba1891eda2aa63800f052cb5af128283d130 (patch)
tree59a18c2262607b4067739fe4dfed3c6fa8e40f14 /arch/m68k/hp300/config.c
parenttime: convert arch_gettimeoffset to a pointer (diff)
downloadlinux-dev-c8d5ba1891eda2aa63800f052cb5af128283d130.tar.xz
linux-dev-c8d5ba1891eda2aa63800f052cb5af128283d130.zip
m68k: set arch_gettimeoffset directly
remove m68k's mach_gettimeoffset function pointer, and instead directly set the arch_gettimeoffset function pointer. This requires multiplying all function results by 1000, since the removed m68k_gettimeoffset() did this. Also, s/unsigned long/u32/ just to make the function prototypes exactly match that of arch_gettimeoffset. Cc: Joshua Thompson <funaho@jurai.org> Cc: Sam Creasey <sammy@sammy.net> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Phil Blundell <philb@gnu.org> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/m68k/hp300/config.c')
-rw-r--r--arch/m68k/hp300/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c
index bf16af1edacf..b7609f791522 100644
--- a/arch/m68k/hp300/config.c
+++ b/arch/m68k/hp300/config.c
@@ -251,7 +251,7 @@ void __init config_hp300(void)
mach_sched_init = hp300_sched_init;
mach_init_IRQ = hp300_init_IRQ;
mach_get_model = hp300_get_model;
- mach_gettimeoffset = hp300_gettimeoffset;
+ arch_gettimeoffset = hp300_gettimeoffset;
mach_hwclk = hp300_hwclk;
mach_get_ss = hp300_get_ss;
mach_reset = hp300_reset;