diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-05-31 22:10:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-06 10:56:10 +0100 |
| commit | 9425032b77c3a4f066a032bac7f7d08668b6cc3c (patch) | |
| tree | 0e9ee91b2947618bfb40187e8550b7d4b9ff5b0a | |
| parent | 2fdf99934c2c39848ad3633ce504a0262f21faf9 (diff) | |
| download | op-kernel-dev-9425032b77c3a4f066a032bac7f7d08668b6cc3c.zip op-kernel-dev-9425032b77c3a4f066a032bac7f7d08668b6cc3c.tar.gz | |
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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-u300/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c index 891cf44..18d7fa0 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c @@ -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); |
