aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm34xx.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-29 16:54:06 -0400
committerTony Lindgren <tony@atomide.com>2012-10-31 13:14:13 -0400
commitbf027ca13738b1548910351952c3fe9b63263a9a (patch)
tree546f201d9ad7c5dc7b3597c88ea9a6ed8647de30 /arch/arm/mach-omap2/pm34xx.c
parenteba36d77a80ba2b0bc435fafc8a1ea4f571da4f6 (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/pm34xx.c')
-rw-r--r--arch/arm/mach-omap2/pm34xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 160fa250c41e..4c85762107bd 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -32,6 +32,7 @@
32 32
33#include <trace/events/power.h> 33#include <trace/events/power.h>
34 34
35#include <asm/fncpy.h>
35#include <asm/suspend.h> 36#include <asm/suspend.h>
36#include <asm/system_misc.h> 37#include <asm/system_misc.h>
37 38
@@ -40,8 +41,6 @@
40#include <plat/prcm.h> 41#include <plat/prcm.h>
41#include <plat-omap/dma-omap.h> 42#include <plat-omap/dma-omap.h>
42 43
43#include "../plat-omap/sram.h"
44
45#include "soc.h" 44#include "soc.h"
46#include "common.h" 45#include "common.h"
47#include "cm2xxx_3xxx.h" 46#include "cm2xxx_3xxx.h"
@@ -52,6 +51,7 @@
52#include "prm2xxx_3xxx.h" 51#include "prm2xxx_3xxx.h"
53#include "pm.h" 52#include "pm.h"
54#include "sdrc.h" 53#include "sdrc.h"
54#include "sram.h"
55#include "control.h" 55#include "control.h"
56 56
57/* pm34xx errata defined in pm.h */ 57/* pm34xx errata defined in pm.h */