diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-30 06:54:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-30 06:54:02 +0200 |
| commit | 6abdd5f5935fff978f950561f3c5175eb34dad73 (patch) | |
| tree | 6f3ed3a4f4af9e74436ec9355ebf8201357f1c40 /drivers/clocksource/pxa_timer.c | |
| parent | net_sched: fix use of uninitialized ethertype variable in cls_flower (diff) | |
| parent | Merge tag 'hwmon-for-linus-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-6abdd5f5935fff978f950561f3c5175eb34dad73.tar.xz linux-6abdd5f5935fff978f950561f3c5175eb34dad73.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All three conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/clocksource/pxa_timer.c')
| -rw-r--r-- | drivers/clocksource/pxa_timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clocksource/pxa_timer.c b/drivers/clocksource/pxa_timer.c index 937e10b84d58..3e1cb512f3ce 100644 --- a/drivers/clocksource/pxa_timer.c +++ b/drivers/clocksource/pxa_timer.c @@ -21,6 +21,8 @@ #include <linux/of_irq.h> #include <linux/sched_clock.h> +#include <clocksource/pxa.h> + #include <asm/div64.h> #define OSMR0 0x00 /* OS Timer 0 Match Register */ |