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/mach-omap2/pm24xx.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/mach-omap2/pm24xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm24xx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c index 6d17e044ffb8..9a2f5594a7dc 100644 --- a/arch/arm/mach-omap2/pm24xx.c +++ b/arch/arm/mach-omap2/pm24xx.c | |||
@@ -31,6 +31,8 @@ | |||
31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
32 | #include <linux/platform_data/gpio-omap.h> | 32 | #include <linux/platform_data/gpio-omap.h> |
33 | 33 | ||
34 | #include <asm/fncpy.h> | ||
35 | |||
34 | #include <asm/mach/time.h> | 36 | #include <asm/mach/time.h> |
35 | #include <asm/mach/irq.h> | 37 | #include <asm/mach/irq.h> |
36 | #include <asm/mach-types.h> | 38 | #include <asm/mach-types.h> |
@@ -38,8 +40,6 @@ | |||
38 | 40 | ||
39 | #include <plat-omap/dma-omap.h> | 41 | #include <plat-omap/dma-omap.h> |
40 | 42 | ||
41 | #include "../plat-omap/sram.h" | ||
42 | |||
43 | #include "soc.h" | 43 | #include "soc.h" |
44 | #include "common.h" | 44 | #include "common.h" |
45 | #include "clock.h" | 45 | #include "clock.h" |
@@ -48,6 +48,7 @@ | |||
48 | #include "cm2xxx_3xxx.h" | 48 | #include "cm2xxx_3xxx.h" |
49 | #include "cm-regbits-24xx.h" | 49 | #include "cm-regbits-24xx.h" |
50 | #include "sdrc.h" | 50 | #include "sdrc.h" |
51 | #include "sram.h" | ||
51 | #include "pm.h" | 52 | #include "pm.h" |
52 | #include "control.h" | 53 | #include "control.h" |
53 | #include "powerdomain.h" | 54 | #include "powerdomain.h" |