diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-09-14 23:42:11 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-09-14 23:42:11 +0300 |
| commit | 7168e947291f0ead07e5638b4599fb7845288b69 (patch) | |
| tree | b39cdf02f6d2282eeb91696d4a1c7ddb6afb0e38 /arch/arm/kernel/perf_event_xscale.c | |
| parent | 21b430d23d233c67e6589ea5054d18392e15a28e (diff) | |
| parent | 60fdcb8863d9b4a8b6c6b367886fadb50d4c0b07 (diff) | |
| download | linux-7168e947291f0ead07e5638b4599fb7845288b69.tar.xz | |
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
Diffstat (limited to 'arch/arm/kernel/perf_event_xscale.c')
| -rw-r--r-- | arch/arm/kernel/perf_event_xscale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event_xscale.c b/arch/arm/kernel/perf_event_xscale.c index 304d056d5b25..aa0499e2eef7 100644 --- a/arch/arm/kernel/perf_event_xscale.c +++ b/arch/arm/kernel/perf_event_xscale.c @@ -16,9 +16,9 @@ #include <asm/cputype.h> #include <asm/irq_regs.h> -#include <asm/pmu.h> #include <linux/of.h> +#include <linux/perf/arm_pmu.h> #include <linux/platform_device.h> enum xscale_perf_types { |