From b676c1fba45f995c10095b61e198f36af2bf929f Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Date: Wed, 19 Dec 2012 13:33:40 +0100
Subject: [PATCH] --- yaml --- r: 355699 b: refs/heads/master c:
 72718e8ce011b2dbf8e6c09a66eb68499a2986e8 h: refs/heads/master i:   355697:
 5df86e01fd3380d5a78c39dc2d4656a4d8cb255b   355695:
 b3ea05a668a6c0ad08427f49afedc53b7adc5038 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/configs/omap2plus_defconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 31e600caeab0..6f70919b46d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 271b22b95a1dfe10fbb269fb41419225148d31a5
+refs/heads/master: 72718e8ce011b2dbf8e6c09a66eb68499a2986e8
diff --git a/trunk/arch/arm/configs/omap2plus_defconfig b/trunk/arch/arm/configs/omap2plus_defconfig
index 1913f8504b3a..b199e7c5c47e 100644
--- a/trunk/arch/arm/configs/omap2plus_defconfig
+++ b/trunk/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