diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-25 11:08:35 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-25 11:08:35 -0700 |
| commit | 8a424bb3c92b2df17008dfa17ac55b602290267b (patch) | |
| tree | 6fa92724403406a12e16a88e84a4ff8887b2618d /arch/arm/plat-omap/include/mach/entry-macro.S | |
| parent | 23b7dd3166fcd88d82ada7e13478fbe4c2231ddf (diff) | |
| download | blackbird-op-linux-8a424bb3c92b2df17008dfa17ac55b602290267b.tar.gz blackbird-op-linux-8a424bb3c92b2df17008dfa17ac55b602290267b.zip | |
ARM: OMAP2/3: Move define of OMAP2_VA_IC_BASE to be local to entry-macro.S
Move define of OMAP2_VA_IC_BASE to be local to entry-macro.S
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/entry-macro.S | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/mach/entry-macro.S b/arch/arm/plat-omap/include/mach/entry-macro.S index 2276f89671d8..33256a0e9a28 100644 --- a/arch/arm/plat-omap/include/mach/entry-macro.S +++ b/arch/arm/plat-omap/include/mach/entry-macro.S @@ -58,11 +58,14 @@ #endif #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) -#if defined(CONFIG_ARCH_OMAP24XX) #include <mach/omap24xx.h> -#endif -#if defined(CONFIG_ARCH_OMAP34XX) #include <mach/omap34xx.h> + +/* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is selected */ +#if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430) +#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP24XX_IC_BASE) +#elif defined(CONFIG_ARCH_OMAP34XX) +#define OMAP2_VA_IC_BASE IO_ADDRESS(OMAP34XX_IC_BASE) #endif #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */ |
