diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-05-21 23:50:23 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-05-21 23:50:23 +0200 |
| commit | e99b32e27147fd02d5a17b4d39b12e7a6562610c (patch) | |
| tree | 2e27b4a74077f3d85ca25b21599c88809eac49a0 /arch/arm/mach-omap1/include | |
| parent | ARM: OMAP1: Change interrupt numbering for sparse IRQ (diff) | |
| download | linux-e99b32e27147fd02d5a17b4d39b12e7a6562610c.tar.xz linux-e99b32e27147fd02d5a17b4d39b12e7a6562610c.zip | |
ARM: OMAP1: Fix randconfig builds if ARCH_OMAP15XX not selected
With the omap1 SPARSE_IRQ changes mach/irqs.h is no longer
automatically included. Turns out now we rely on ARCH_OMAP15XX
including hardware.h from memory.h, so without ARCH_OMAP15XX
we get build failures.
As we have legacy drivers still relying on these indirect
includes, let's not add more mach includes to the drivers.
Those have to be removed anyways for multiplatform support.
Let's fix up mach-omap1 to include soc.h where cpu_is_omap
checks are done, and common.h for board-*.c files.
But let's keep the indirect memory.h include for now to avoid
unnecessary churn in the drivers.
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/memory.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/include/mach/memory.h b/arch/arm/mach-omap1/include/mach/memory.h index 058a4f7d44c5..d43ff0f1cbf8 100644 --- a/arch/arm/mach-omap1/include/mach/memory.h +++ b/arch/arm/mach-omap1/include/mach/memory.h @@ -5,6 +5,9 @@ #ifndef __ASM_ARCH_MEMORY_H #define __ASM_ARCH_MEMORY_H +/* REVISIT: omap1 legacy drivers still rely on this */ +#include <mach/soc.h> + /* * Bus address is physical address, except for OMAP-1510 Local Bus. * OMAP-1510 bus address is translated into a Local Bus address if the @@ -14,7 +17,6 @@ * because of the strncmp(). */ #if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__) -#include <mach/soc.h> /* * OMAP-1510 Local Bus address offset |