diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 06:20:31 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 06:20:31 -0500 |
| commit | 0ba86d7edea1f9f2d9497c31200910263e8b4128 (patch) | |
| tree | 387f713e1afdd181e92699dcaa5fa3d45b30c75b /arch/arm/plat-omap/common.c | |
| parent | 973b659cbf2604b0b52829c224f6064d64118818 (diff) | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
Merge commit 'v3.3-rc6'
Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.
Conflicts:
arch/arm/mach-omap1/board-innovator.c
drivers/video/omap2/dss/apply.c
Diffstat (limited to 'arch/arm/plat-omap/common.c')
| -rw-r--r-- | arch/arm/plat-omap/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 2081f0f578e5..f1e46ea6b81d 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
| @@ -67,6 +67,7 @@ void __init omap_reserve(void) | |||
| 67 | omap_vram_reserve_sdram_memblock(); | 67 | omap_vram_reserve_sdram_memblock(); |
| 68 | omap_dsp_reserve_sdram_memblock(); | 68 | omap_dsp_reserve_sdram_memblock(); |
| 69 | omap_secure_ram_reserve_memblock(); | 69 | omap_secure_ram_reserve_memblock(); |
| 70 | omap_barrier_reserve_memblock(); | ||
| 70 | } | 71 | } |
| 71 | 72 | ||
| 72 | void __init omap_init_consistent_dma_size(void) | 73 | void __init omap_init_consistent_dma_size(void) |