aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorGravatar Javier Martinez Canillas <javier.martinez@collabora.co.uk> 2012-12-19 13:33:40 +0100
committerGravatar Tony Lindgren <tony@atomide.com> 2013-02-01 14:59:34 -0800
commit72718e8ce011b2dbf8e6c09a66eb68499a2986e8 (patch)
tree9762305f7ef80266991a79bc9306786bc68393cc /arch/arm
parentARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support (diff)
downloadlinux-72718e8ce011b2dbf8e6c09a66eb68499a2986e8.tar.gz
linux-72718e8ce011b2dbf8e6c09a66eb68499a2986e8.tar.bz2
linux-72718e8ce011b2dbf8e6c09a66eb68499a2986e8.zip
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 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