summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress
diff options
context:
space:
mode:
authorRussell King2012-01-19 11:05:41 +0100
committerRussell King2012-03-24 10:38:51 +0100
commit195864cf3d6f5b6b743793bda3aaa2ff65d322ae (patch)
treed6692b92ca3df0c38887ed186360328bbb3b007b /arch/arm/mach-vexpress
parentARM: SMP: use a timing out completion for cpu hotplug (diff)
downloadkernel-qcow2-linux-195864cf3d6f5b6b743793bda3aaa2ff65d322ae.tar.gz
kernel-qcow2-linux-195864cf3d6f5b6b743793bda3aaa2ff65d322ae.tar.xz
kernel-qcow2-linux-195864cf3d6f5b6b743793bda3aaa2ff65d322ae.zip
ARM: move CP15 definitions to separate header file
Avoid namespace conflicts with drivers over the CP15 definitions by moving CP15 related prototypes and definitions to a private header file. Acked-by: Stephen Warren <swarren@nvidia.com> Tested-by: Stephen Warren <swarren@nvidia.com> [Tegra] Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com> [EP93xx] Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-vexpress')
-rw-r--r--arch/arm/mach-vexpress/hotplug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
index 813ee08f96e6..7a05548544c3 100644
--- a/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@ -13,7 +13,7 @@
#include <linux/smp.h>
#include <asm/cacheflush.h>
-#include <asm/system.h>
+#include <asm/cp15.h>
extern volatile int pen_release;