diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-28 19:30:01 +0200 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2012-03-28 19:30:01 +0200 |
commit | 15d07dc9c59eae51219c40253bdf920f62bb10f2 (patch) | |
tree | d830b428bf55526b1ab80139f6b4c24d4b38d627 /arch/arm/kernel/setup.c | |
parent | Disintegrate asm/system.h for Alpha (diff) | |
download | linux-15d07dc9c59eae51219c40253bdf920f62bb10f2.tar.xz linux-15d07dc9c59eae51219c40253bdf920f62bb10f2.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>
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r-- | arch/arm/kernel/setup.c | 2 |
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> |