From: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Date: Wed, 19 Dec 2012 12:33:40 +0000 (+0100)
Subject: ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=72718e8ce011b2dbf8e6c09a66eb68499a2986e8;p=deliverable%2Flinux.git

ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator

The OMAP framebuffer driver now uses the standard dma allocator
instead of the (now removed) omap specific vram allocator.

Enable the Contiguous Memory Allocator by default to allow large
dma memory buffers allocation.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 1913f8504b3a..b199e7c5c47e 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -64,6 +64,7 @@ CONFIG_MAC80211=m
 CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_DEFAULT_PID=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_CMA=y
 CONFIG_CONNECTOR=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y