aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kernel/setup.c
diff options
context:
space:
mode:
authorRussell King <[email protected]>2012-03-28 18:30:01 +0100
committerDavid Howells <[email protected]>2012-03-28 18:30:01 +0100
commit15d07dc9c59eae51219c40253bdf920f62bb10f2 (patch)
treed830b428bf55526b1ab80139f6b4c24d4b38d627 /arch/arm/kernel/setup.c
parentec2212088c42ff7d1362629ec26dda4f3e8bdad3 (diff)
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 <[email protected]> Tested-by: Stephen Warren <[email protected]> [Tegra] Acked-by: H Hartley Sweeten <[email protected]> Tested-by: H Hartley Sweeten <[email protected]> [EP93xx] Acked-by: Nicolas Pitre <[email protected]> Acked-by: Kukjin Kim <[email protected]> Signed-off-by: Russell King <[email protected]> Signed-off-by: David Howells <[email protected]>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r--arch/arm/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index a255c39612ca..615e992d738d 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -33,6 +33,7 @@
#include <linux/sort.h>
#include <asm/unified.h>
+#include <asm/cp15.h>
#include <asm/cpu.h>
#include <asm/cputype.h>
#include <asm/elf.h>
@@ -44,7 +45,6 @@
#include <asm/cacheflush.h>
#include <asm/cachetype.h>
#include <asm/tlbflush.h>
-#include <asm/system.h>
#include <asm/prom.h>
#include <asm/mach/arch.h>