Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9425032b authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 6947/2: mach-u300: fix compilation error in timer 



The introduction of the mmio timer accidentally referenced the
old clocksource struct which does not exist anymore. Fix this by
using a simple string instead.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2fdf9993

arch/arm/mach-u300/timer.c

+1 −2
Original line number Diff line number Diff line
@@ -411,8 +411,7 @@ static void __init u300_timer_init(void) 
	/* Use general purpose timer 2 as clock source */

	if (clocksource_mmio_init(U300_TIMER_APP_VBASE + U300_TIMER_APP_GPT2CC,

			"GPT2", rate, 300, 32, clocksource_mmio_readl_up))

		printk(KERN_ERR "timer: failed to initialize clock "

		       "source %s\n", clocksource_u300_1mhz.name);

		pr_err("timer: failed to initialize U300 clock source\n");



	clockevents_calc_mult_shift(&clockevent_u300_1mhz,

				    rate, APPTIMER_MIN_RANGE);