diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-29 16:54:06 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-31 13:14:13 -0400 |
commit | bf027ca13738b1548910351952c3fe9b63263a9a (patch) | |
tree | 546f201d9ad7c5dc7b3597c88ea9a6ed8647de30 /arch/arm/plat-omap/sram.c | |
parent | eba36d77a80ba2b0bc435fafc8a1ea4f571da4f6 (diff) |
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 @@ | |||
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
22 | 22 | ||
23 | #include <asm/fncpy.h> | ||
23 | #include <asm/tlb.h> | 24 | #include <asm/tlb.h> |
24 | #include <asm/cacheflush.h> | 25 | #include <asm/cacheflush.h> |
25 | 26 | ||
26 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
27 | 28 | ||
28 | #include "../mach-omap1/soc.h" | 29 | #include "../mach-omap1/soc.h" |
30 | #include "../mach-omap1/sram.h" | ||
29 | #include "../mach-omap2/soc.h" | 31 | #include "../mach-omap2/soc.h" |
30 | 32 | #include "../mach-omap2/sram.h" | |
31 | #include "sram.h" | ||
32 | 33 | ||
33 | /* XXX These "sideways" includes will disappear when sram.c becomes a driver */ | 34 | /* XXX These "sideways" includes will disappear when sram.c becomes a driver */ |
34 | #include "../mach-omap2/iomap.h" | 35 | #include "../mach-omap2/iomap.h" |