From 573d403a242b12bcc50e27692a0bd9ad380cc8f4 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Fri, 22 Feb 2013 15:10:22 -0300
Subject: [PATCH] --- yaml --- r: 370620 b: refs/heads/master c:
 5451a6b94b1889795958984bf3684698f2fd890c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7631cf98cf87..2a60ad0a13bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f4a067f1ca6c7e81fdb167023d0f2612e8bcfe1
+refs/heads/master: 5451a6b94b1889795958984bf3684698f2fd890c
diff --git a/trunk/arch/arm/configs/mxs_defconfig b/trunk/arch/arm/configs/mxs_defconfig
index bacbd836f903..ad24193525f5 100644
--- a/trunk/arch/arm/configs/mxs_defconfig
+++ b/trunk/arch/arm/configs/mxs_defconfig
@@ -122,6 +122,7 @@ CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_MMC=y
+CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_MXS=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y