diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-12-09 01:22:57 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-12-09 01:22:57 +0400 |
| commit | 4c89aad9f4803875f7065e825badc9ba61922091 (patch) | |
| tree | d0c60e673e527085aaddd76fb512311aa6159e40 /arch/arm/plat-omap/common.c | |
| parent | deee6d5359969a0ce4e2760cfd7b9f379bd5698a (diff) | |
| parent | ff819da44258ca12b9f60dfd589884106e5a3129 (diff) | |
| download | linux-4c89aad9f4803875f7065e825badc9ba61922091.tar.xz | |
Merge branch 'for_3.3/pm/omap4-mpuss' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap4
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 2ee6341fffdb..06383b51e655 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -22,6 +22,8 @@ #include <plat/vram.h> #include <plat/dsp.h> +#include <plat/omap-secure.h> + #define NO_LENGTH_CHECK 0xffffffff @@ -66,6 +68,7 @@ void __init omap_reserve(void) omapfb_reserve_sdram_memblock(); omap_vram_reserve_sdram_memblock(); omap_dsp_reserve_sdram_memblock(); + omap_secure_ram_reserve_memblock(); } void __init omap_init_consistent_dma_size(void) |