aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/sun3x/config.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-11-08 13:34:55 -0500
committerStephen Warren <swarren@nvidia.com>2012-12-24 11:36:34 -0500
commitc8d5ba1891eda2aa63800f052cb5af128283d130 (patch)
tree59a18c2262607b4067739fe4dfed3c6fa8e40f14 /arch/m68k/sun3x/config.c
parent7b1f62076bba10786d2118006ae68ac120cd6c56 (diff)
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/sun3x/config.c')
-rw-r--r--arch/m68k/sun3x/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c
index dd306c84d36d..0532d64d191e 100644
--- a/arch/m68k/sun3x/config.c
+++ b/arch/m68k/sun3x/config.c
@@ -48,7 +48,7 @@ void __init config_sun3x(void)
48 mach_sched_init = sun3x_sched_init; 48 mach_sched_init = sun3x_sched_init;
49 mach_init_IRQ = sun3_init_IRQ; 49 mach_init_IRQ = sun3_init_IRQ;
50 50
51 mach_gettimeoffset = sun3x_gettimeoffset; 51 arch_gettimeoffset = sun3x_gettimeoffset;
52 mach_reset = sun3x_reboot; 52 mach_reset = sun3x_reboot;
53 53
54 mach_hwclk = sun3x_hwclk; 54 mach_hwclk = sun3x_hwclk;