diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 15:28:50 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-03 15:28:50 +0100 |
commit | 3ff32a0def6e0d2e21a6c5ad1b00726592774018 (patch) | |
tree | af683b2cb62f7e5ee18cb109d15dcfd43769b984 /arch/arm/kernel/perf_event_v6.c | |
parent | 40d3f02851577da27b5cbb1538888301245ef1e7 (diff) | |
parent | 81497953e37bc28209d9a647171ea93b4a99fc57 (diff) | |
download | lwn-3ff32a0def6e0d2e21a6c5ad1b00726592774018.tar.gz lwn-3ff32a0def6e0d2e21a6c5ad1b00726592774018.zip |
Merge branch 'devel-stable' into for-linus
Conflicts:
drivers/perf/arm_pmu.c
Diffstat (limited to 'arch/arm/kernel/perf_event_v6.c')
-rw-r--r-- | arch/arm/kernel/perf_event_v6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c index 09f83e414a72..09413e7b49aa 100644 --- a/arch/arm/kernel/perf_event_v6.c +++ b/arch/arm/kernel/perf_event_v6.c @@ -34,9 +34,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 armv6_perf_types { |