diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-05 20:25:59 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-18 23:23:46 (GMT) |
commit | e4c060db2c13f10de09101afc564763f9fd0019a (patch) | |
tree | 48a3ea5484e3fc9e485d7bb1b0e3d8795c67d368 /arch/arm/mach-omap1/include | |
parent | e10dd62ffcb2953f80a4ea6ac53cb489ebfe0a79 (diff) | |
download | linux-e4c060db2c13f10de09101afc564763f9fd0019a.tar.xz |
ARM: OMAP: Split plat/cpu.h into local soc.h for mach-omap1 and mach-omap2
We want to remove plat/cpu.h. To do this, let's first split
it to private soc.h to mach-omap1 and mach-omap2. We have to
keep plat/cpu.h around until the remaining drivers are fixed,
so let's include the local soc.h in plat/cpu.h and for drivers
still including plat/cpu.h.
Once the drivers are fixed not to include plat/cpu.h, we
can remove the file.
This is needed for the ARM common zImage support.
[tony@atomide.com: updated to not print a warning]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/include')
-rw-r--r-- | arch/arm/mach-omap1/include/mach/hardware.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap1/include/mach/memory.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/include/mach/hardware.h b/arch/arm/mach-omap1/include/mach/hardware.h index 2e60265..f9989d3 100644 --- a/arch/arm/mach-omap1/include/mach/hardware.h +++ b/arch/arm/mach-omap1/include/mach/hardware.h @@ -39,7 +39,7 @@ #include <asm/sizes.h> #ifndef __ASSEMBLER__ #include <asm/types.h> -#include <plat/cpu.h> +#include "../../mach-omap1/soc.h" /* * NOTE: Please use ioremap + __raw_read/write where possible instead of these diff --git a/arch/arm/mach-omap1/include/mach/memory.h b/arch/arm/mach-omap1/include/mach/memory.h index 901082d..351ae4f 100644 --- a/arch/arm/mach-omap1/include/mach/memory.h +++ b/arch/arm/mach-omap1/include/mach/memory.h @@ -19,7 +19,7 @@ * because of the strncmp(). */ #if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__) -#include <plat/cpu.h> +#include "../../mach-omap1/soc.h" /* * OMAP-1510 Local Bus address offset |