diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-29 21:54:06 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-31 18:14:13 +0100 |
| commit | bf027ca13738b1548910351952c3fe9b63263a9a (patch) | |
| tree | 546f201d9ad7c5dc7b3597c88ea9a6ed8647de30 /arch/arm/plat-omap/sram.c | |
| parent | ARM: OMAP1: usb: fix sparse warnings (diff) | |
| download | linux-bf027ca13738b1548910351952c3fe9b63263a9a.tar.xz linux-bf027ca13738b1548910351952c3fe9b63263a9a.zip | |
ARM: OMAP: Split sram.h to local headers and minimal shared header
Most of the defines are specific to omap1 and omap2+,
and should be in the local headers. Only minimal function
prototypes need to be shared.
As discussed on linux-arm-kernel, we want to avoid
relative includes for the arch/arm/*omap* shared code:
http://www.spinics.net/lists/linux-omap/msg80520.html
So this patch re-adds a minimal plat/sram.h.
The new plat/sram.h must not be included from drivers,
that will break build for omap2+ CONFIG_MULTIPLATFORM.
Note that this patch temporarily adds two more
relative includes; Those will be removed in the
following patch.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/sram.c')
| -rw-r--r-- | arch/arm/plat-omap/sram.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 70dcc225157f..337292935256 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -20,15 +20,16 @@ #include <linux/init.h> #include <linux/io.h> +#include <asm/fncpy.h> #include <asm/tlb.h> #include <asm/cacheflush.h> #include <asm/mach/map.h> #include "../mach-omap1/soc.h" +#include "../mach-omap1/sram.h" #include "../mach-omap2/soc.h" - -#include "sram.h" +#include "../mach-omap2/sram.h" /* XXX These "sideways" includes will disappear when sram.c becomes a driver */ #include "../mach-omap2/iomap.h" |