diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-30 15:30:44 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-31 15:37:14 -0700 |
| commit | 4e969010c55d72fbdc69333ce59392c7b530f6a3 (patch) | |
| tree | c7f5d9ae1d99ae47722f63f7886e8919af68d96a /arch/arm/mach-omap1/include/mach/hardware.h | |
| parent | 8280960181eae6e4039957044577b6ef7154220f (diff) | |
ARM: OMAP1: Remove relative includes
As discussed on linux-arm-kernel, we want to avoid
relative includes for the arch/arm/*omap* code:
http://www.spinics.net/lists/linux-omap/msg80520.html
Note that eventually when the omap1 specific drivers
are fixed to not use cpu_is_omap macros and not depend
on mach/hardware.h, this patch can be reverted and these
headers can be local. But since just fixing the drivers for
omap2+ is already a big enough hassle, let's deal
with that properly first.
[tony@atomide.com: also drop unused include for ispvideo.c]
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-omap1/include/mach/hardware.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/include/mach/hardware.h b/arch/arm/mach-omap1/include/mach/hardware.h index dc3237bd72d..5875a5098d3 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 "../../mach-omap1/soc.h" +#include <mach/soc.h> /* * NOTE: Please use ioremap + __raw_read/write where possible instead of these @@ -72,6 +72,9 @@ static inline u32 omap_cs3_phys(void) #endif /* ifndef __ASSEMBLER__ */ +#define OMAP1_IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */ +#define OMAP1_IO_ADDRESS(pa) IOMEM((pa) - OMAP1_IO_OFFSET) + #include <mach/serial.h> /* |