diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 07:35:09 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 07:35:09 -0700 |
commit | 0c9e98af5e94877ad3b1af2c0f39b2376a462ded (patch) | |
tree | acbab68f802fadbff85590c139c87dc199bb465d /arch/arm/mach-u300/timer.c | |
parent | af0c25c4876305dfa1a25ac1cc92d3cddfa476a6 (diff) | |
parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
download | linux-next-0c9e98af5e94877ad3b1af2c0f39b2376a462ded.tar.gz |
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-u300/timer.c')
-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 891cf44591e0..18d7fa0603c2 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); |