summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-09-03 15:28:50 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-09-03 15:28:50 +0100
commit3ff32a0def6e0d2e21a6c5ad1b00726592774018 (patch)
treeaf683b2cb62f7e5ee18cb109d15dcfd43769b984 /arch/arm/mach-ux500
parent40d3f02851577da27b5cbb1538888301245ef1e7 (diff)
parent81497953e37bc28209d9a647171ea93b4a99fc57 (diff)
downloadlinux-3ff32a0def6e0d2e21a6c5ad1b00726592774018.tar.bz2
Merge branch 'devel-stable' into for-linus
Conflicts: drivers/perf/arm_pmu.c
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 16913800bbf9..5578dc1ab52b 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -20,10 +20,10 @@
#include <linux/mfd/dbx500-prcmu.h>
#include <linux/of.h>
#include <linux/of_platform.h>
+#include <linux/perf/arm_pmu.h>
#include <linux/regulator/machine.h>
#include <linux/random.h>
-#include <asm/pmu.h>
#include <asm/mach/map.h>
#include "setup.h"