diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-22 14:32:24 -0500 |
| commit | 808601b75804475c9022f6375e76b7c62c99a10a (patch) | |
| tree | 355a3100269e88460e36f251ef0ce2f1ed88d52e /arch/arm/plat-omap/sram.c | |
| parent | c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 (diff) | |
| parent | f17f9726c27c3921e00a5750e85070e6dd7e1ff7 (diff) | |
Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus
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 1a686c89d8dd..e26e50487d60 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c | |||
| @@ -33,9 +33,10 @@ | |||
| 33 | 33 | ||
| 34 | #include "sram.h" | 34 | #include "sram.h" |
| 35 | #include "fb.h" | 35 | #include "fb.h" |
| 36 | |||
| 37 | /* XXX These "sideways" includes are a sign that something is wrong */ | ||
| 36 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 38 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) |
| 37 | # include "../mach-omap2/prm.h" | 39 | # include "../mach-omap2/prm2xxx_3xxx.h" |
| 38 | # include "../mach-omap2/cm.h" | ||
| 39 | # include "../mach-omap2/sdrc.h" | 40 | # include "../mach-omap2/sdrc.h" |
| 40 | #endif | 41 | #endif |
| 41 | 42 | ||