diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 12:50:32 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 12:50:32 +0200 |
| commit | 8e6cec1c7c5afa489687c90be15d6ed82c742975 (patch) | |
| tree | bc11ebf33e34303bbc673c59d807686a3659d1e8 /drivers/clocksource/cadence_ttc_timer.c | |
| parent | dbb236c1ceb697a559e0694ac4c9e7b9131d0b16 (diff) | |
| parent | 459fa246d8fa4a543ed9a3331f15c8fe1caf9937 (diff) | |
Merge branch 'clockevents/4.12-fixes' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent
Pull clockevents fixes from Daniel Lezcano:
- Fixed wrong iomem area unmapped in the arch_arm_timer (Frank Rowand)
- Added missing includes for sun5i and cadence-ttc (Stephen Rothwell)
Diffstat (limited to 'drivers/clocksource/cadence_ttc_timer.c')
| -rw-r--r-- | drivers/clocksource/cadence_ttc_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c index 44e5e951583b..8e64b8460f11 100644 --- a/drivers/clocksource/cadence_ttc_timer.c +++ b/drivers/clocksource/cadence_ttc_timer.c @@ -18,6 +18,7 @@ #include <linux/clk.h> #include <linux/interrupt.h> #include <linux/clockchips.h> +#include <linux/clocksource.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/slab.h> |