diff options
Diffstat (limited to 'arch/m68k/mvme16x/config.c')
-rw-r--r-- | arch/m68k/mvme16x/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index b6d7d8a7a3dd..080a342458a1 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c | |||
@@ -43,7 +43,7 @@ static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE; | |||
43 | 43 | ||
44 | static void mvme16x_get_model(char *model); | 44 | static void mvme16x_get_model(char *model); |
45 | extern void mvme16x_sched_init(irq_handler_t handler); | 45 | extern void mvme16x_sched_init(irq_handler_t handler); |
46 | extern unsigned long mvme16x_gettimeoffset (void); | 46 | extern u32 mvme16x_gettimeoffset(void); |
47 | extern int mvme16x_hwclk (int, struct rtc_time *); | 47 | extern int mvme16x_hwclk (int, struct rtc_time *); |
48 | extern int mvme16x_set_clock_mmss (unsigned long); | 48 | extern int mvme16x_set_clock_mmss (unsigned long); |
49 | extern void mvme16x_reset (void); | 49 | extern void mvme16x_reset (void); |
@@ -289,7 +289,7 @@ void __init config_mvme16x(void) | |||
289 | mach_max_dma_address = 0xffffffff; | 289 | mach_max_dma_address = 0xffffffff; |
290 | mach_sched_init = mvme16x_sched_init; | 290 | mach_sched_init = mvme16x_sched_init; |
291 | mach_init_IRQ = mvme16x_init_IRQ; | 291 | mach_init_IRQ = mvme16x_init_IRQ; |
292 | mach_gettimeoffset = mvme16x_gettimeoffset; | 292 | arch_gettimeoffset = mvme16x_gettimeoffset; |
293 | mach_hwclk = mvme16x_hwclk; | 293 | mach_hwclk = mvme16x_hwclk; |
294 | mach_set_clock_mmss = mvme16x_set_clock_mmss; | 294 | mach_set_clock_mmss = mvme16x_set_clock_mmss; |
295 | mach_reset = mvme16x_reset; | 295 | mach_reset = mvme16x_reset; |
@@ -405,9 +405,9 @@ void mvme16x_sched_init (irq_handler_t timer_routine) | |||
405 | 405 | ||
406 | 406 | ||
407 | /* This is always executed with interrupts disabled. */ | 407 | /* This is always executed with interrupts disabled. */ |
408 | unsigned long mvme16x_gettimeoffset (void) | 408 | u32 mvme16x_gettimeoffset(void) |
409 | { | 409 | { |
410 | return (*(volatile unsigned long *)0xfff42008); | 410 | return (*(volatile u32 *)0xfff42008) * 1000; |
411 | } | 411 | } |
412 | 412 | ||
413 | int bcd2int (unsigned char b) | 413 | int bcd2int (unsigned char b) |