diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-11-01 00:11:16 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-11-01 00:11:16 +0100 |
| commit | eccbf5fbb4dbeece1c611a4897a1b3679510b8bf (patch) | |
| tree | 0eb0b14c72dddcaa3a7cb1503be41d0339e3981a /drivers/clocksource/rockchip_timer.c | |
| parent | fb56d689fb1c8f13d4d7168abf3838657b042885 (diff) | |
| parent | f48729a999ee57b9e831245779e68200dd2bde09 (diff) | |
Merge branch 'clockevents/4.15' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent updates from Daniel Lezcano:
- Improve the generic clockevents dependency by factoring out the option
in the Kconfig menu option (Arnd Bergmann)
- Add missing "\n" in pr_err messages for fttmr010, owl and rockchip
(Arvind Yadav)
- Add missing timer_of_exit function to rollback timer_of_init (Benjamin
Gaignard)
- Fix path and add bindings to timers (Daniel Lezcano)
- Cleanup and remove support for renesas,cmt-32* (Geert Uytterhoeven)
- Add support for separate R-Car Gen2 (Magnus Damm)
- Fix DEFINE_PER_CPU length definition to prevent warning at expansion
time for the arm_arch_timer (Mark Rutland)
- Remove pointless irq_save,restore in an already irq-disabled callback
and add a shortcut optimization for the local cpu on mips-gic-timer
(Matt Redfearn)
Diffstat (limited to 'drivers/clocksource/rockchip_timer.c')
| -rw-r--r-- | drivers/clocksource/rockchip_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c index c27f4c850d83..33f370dbd0d6 100644 --- a/drivers/clocksource/rockchip_timer.c +++ b/drivers/clocksource/rockchip_timer.c @@ -274,7 +274,7 @@ static int __init rk_clksrc_init(struct device_node *np) TIMER_NAME, rk_clksrc->freq, 250, 32, clocksource_mmio_readl_down); if (ret) { - pr_err("Failed to register clocksource"); + pr_err("Failed to register clocksource\n"); goto out_clocksource; } |