From ef1aae30e9709d6aaccc53a6a859c4ee6cf0b18d Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Wed, 4 Jul 2012 13:37:50 -0300
Subject: [PATCH] --- yaml --- r: 313439 b: refs/heads/master c:
 ab271668626d1ab3cb862f6b9faeb836c84864be h: refs/heads/master i:   313437:
 7fb1af6b7b4c8a1ace9e4128f91d641042d2d39a   313435:
 3ff38ccb2bf3571a81dd37a263abb55461f63e3b   313431:
 0d8a91d9fc63b597a4cfa86f7acb740e5127ff37   313423:
 3b10a01a9e762af20c65d742ee79af6aa46492ee   313407:
 5e21ffe9211209bfa8bc5db3b7bc96a912f30ab9 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 785efc2ebdc7..6e095e21adb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 783f061371536b1c2f8326e24f4ff287348ea59c
+refs/heads/master: ab271668626d1ab3cb862f6b9faeb836c84864be
diff --git a/trunk/arch/arm/configs/mxs_defconfig b/trunk/arch/arm/configs/mxs_defconfig
index 94198c52fe2c..1450f64b3a13 100644
--- a/trunk/arch/arm/configs/mxs_defconfig
+++ b/trunk/arch/arm/configs/mxs_defconfig
@@ -114,6 +114,7 @@ CONFIG_MMC=y
 CONFIG_MMC_MXS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_STMP=y
 CONFIG_DMADEVICES=y
 CONFIG_MXS_DMA=y
 CONFIG_EXT3_FS=y