diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-17 10:55:14 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-17 10:55:14 +0200 |
| commit | 821596a50aba6873ff4ea8fdf2b1515638c3c8a3 (patch) | |
| tree | df74b2e08494cc321e7752b191055a511c90ff97 /drivers/clocksource/vf_pit_timer.c | |
| parent | 2886a734081ed31f3279550ea9d50ef1d84a84e6 (diff) | |
| parent | 6f9c89000c3f771c47adacaca2df775a25f27205 (diff) | |
Merge branch 'clockevents/4.12' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevents updates from Daniel Lezcano
- Provide a framework to handle errata gracefuly for arm_arch_timer (Mark
Zyngier)
- Clarify the DT properties for the rockchip timer and add the clocksource as
an alternative to the bogus architected timer (Alexander Kochetkov)
- Rename the Gemini timer to Faraday timer fttmr010 and provide a specific
initialization for Gemini (Linus Walleij)
- Add missing newlines in the error message in the timers (Rafał Miłecki)
- Read the clock once and implement the delay timer on Orion (Russell King)
Diffstat (limited to 'drivers/clocksource/vf_pit_timer.c')
| -rw-r--r-- | drivers/clocksource/vf_pit_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/vf_pit_timer.c b/drivers/clocksource/vf_pit_timer.c index 55d8d8402d90..e0849e20a307 100644 --- a/drivers/clocksource/vf_pit_timer.c +++ b/drivers/clocksource/vf_pit_timer.c @@ -165,7 +165,7 @@ static int __init pit_timer_init(struct device_node *np) timer_base = of_iomap(np, 0); if (!timer_base) { - pr_err("Failed to iomap"); + pr_err("Failed to iomap\n"); return -ENXIO; } |