diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-02 19:22:03 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-02 19:22:03 +0300 |
| commit | 4a6808f347a3f969e56e8e4274e70849ecdc33de (patch) | |
| tree | d973e31999a6e36ffa681d13473c6d3f0db5284e /drivers | |
| parent | 907977b2a22c5d1f465fbe9657d0003f057f9b1e (diff) | |
| parent | 8d09617b076fd03ee9ae124abce94dda17bf3723 (diff) | |
| download | linux-4a6808f347a3f969e56e8e4274e70849ecdc33de.tar.xz | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"Two small fixes for the new CLKEVT_OF infrastructure"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
vmlinux.lds: Add __clkevt_of_table to kernel
clockevents: Fix syntax error in clkevt-of macro
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clocksource/clkevt-probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/clkevt-probe.c b/drivers/clocksource/clkevt-probe.c index 8c30fec86094..eb89b502acbd 100644 --- a/drivers/clocksource/clkevt-probe.c +++ b/drivers/clocksource/clkevt-probe.c @@ -17,7 +17,7 @@ #include <linux/init.h> #include <linux/of.h> -#include <linux/clockchip.h> +#include <linux/clockchips.h> extern struct of_device_id __clkevt_of_table[]; |