diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-24 22:34:35 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-24 22:34:35 +0400 |
| commit | 2c799cef4d145af2182594a41cb5e5b42f2535c5 (patch) | |
| tree | 0d2f7e028e2b5e3c616243828d743b818d23c93a /arch/arm/mach-omap1/include/mach/memory.h | |
| parent | ee0839c22cdda7f2e5f06e2d0351e2b49e0975ff (diff) | |
| download | linux-2c799cef4d145af2182594a41cb5e5b42f2535c5.tar.xz | |
ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h
This is needed to minimize io.h so the SoC specific io.h
for ARMs can removed.
Note that minimal driver changes for DSS and RNG are needed to
include cpu.h for SoC detection macros.
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-omap1/include/mach/memory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/include/mach/memory.h b/arch/arm/mach-omap1/include/mach/memory.h index c6337645ba8a..901082def9bd 100644 --- a/arch/arm/mach-omap1/include/mach/memory.h +++ b/arch/arm/mach-omap1/include/mach/memory.h @@ -18,7 +18,8 @@ * Note that the is_lbus_device() test is not very efficient on 1510 * because of the strncmp(). */ -#ifdef CONFIG_ARCH_OMAP15XX +#if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__) +#include <plat/cpu.h> /* * OMAP-1510 Local Bus address offset |