summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier.martinez@collabora.co.uk>2012-12-19 12:33:40 (GMT)
committerTony Lindgren <tony@atomide.com>2013-02-01 22:59:34 (GMT)
commit72718e8ce011b2dbf8e6c09a66eb68499a2986e8 (patch)
tree9762305f7ef80266991a79bc9306786bc68393cc /arch/arm
parent271b22b95a1dfe10fbb269fb41419225148d31a5 (diff)
downloadlinux-fsl-qoriq-72718e8ce011b2dbf8e6c09a66eb68499a2986e8.tar.xz
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/omap2plus_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 1913f85..b199e7c 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