diff options
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 3ca81e0ada5e..ec084d158f64 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -379,7 +379,7 @@ static struct clocksource clocksource_gpt = {  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,  }; -static u32 notrace dmtimer_read_sched_clock(void) +static u64 notrace dmtimer_read_sched_clock(void)  {  	if (clksrc.reserved)  		return __omap_dm_timer_read_counter(&clksrc, @@ -471,7 +471,7 @@ static void __init omap2_gptimer_clocksource_init(int gptimer_id,  	__omap_dm_timer_load_start(&clksrc,  				   OMAP_TIMER_CTRL_ST | OMAP_TIMER_CTRL_AR, 0,  				   OMAP_TIMER_NONPOSTED); -	setup_sched_clock(dmtimer_read_sched_clock, 32, clksrc.rate); +	sched_clock_register(dmtimer_read_sched_clock, 32, clksrc.rate);  	if (clocksource_register_hz(&clocksource_gpt, clksrc.rate))  		pr_err("Could not register clocksource %s\n",  |