diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 16:59:23 +0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-08-21 16:59:23 +0400 |
| commit | cfb6d656d569510ac9239583ce09e4c92ad54719 (patch) | |
| tree | f80d4526a5a293d69a0262b04890ba296c8874ab /drivers/clocksource/moxart_timer.c | |
| parent | fac778a2b8d6ca953d440baeee72901c2dd5aad9 (diff) | |
| parent | 220069945b298d3998c6598b081c466dca259929 (diff) | |
| download | linux-cfb6d656d569510ac9239583ce09e4c92ad54719.tar.xz | |
Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core
* Support for memory mapped arch_timers
* Trivial fixes to the moxart timer code
* Documentation updates
Trivial conflicts in drivers/clocksource/arm_arch_timer.c. Fixed up
the newly added __cpuinit annotations as well.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/clocksource/moxart_timer.c')
| -rw-r--r-- | drivers/clocksource/moxart_timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c index 08a5943b3e42..5eb2c35932b1 100644 --- a/drivers/clocksource/moxart_timer.c +++ b/drivers/clocksource/moxart_timer.c @@ -20,6 +20,7 @@ #include <linux/of_irq.h> #include <linux/io.h> #include <linux/clocksource.h> +#include <linux/bitops.h> #define TIMER1_BASE 0x00 #define TIMER2_BASE 0x10 |