From 72718e8ce011b2dbf8e6c09a66eb68499a2986e8 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 19 Dec 2012 13:33:40 +0100 Subject: [PATCH] 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 Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren --- arch/arm/configs/omap2plus_defconfig | 1 + 1 file changed, 1 insertion(+) 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 -- 2.7.4