From 1c930f5236adab5e640f94c1873e1617595b462b Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Fri, 1 Mar 2013 09:42:33 -0300
Subject: [PATCH] --- yaml --- r: 370621 b: refs/heads/master c:
 656c284c5c517460245db159e122b0207f06f998 h: refs/heads/master i:   370619:
 5f8ecd41e117675ba0d1b8f9c25897aefc836578 v: v3

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

diff --git a/[refs] b/[refs]
index 2a60ad0a13bc..19205461e1a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5451a6b94b1889795958984bf3684698f2fd890c
+refs/heads/master: 656c284c5c517460245db159e122b0207f06f998
diff --git a/trunk/arch/arm/configs/mxs_defconfig b/trunk/arch/arm/configs/mxs_defconfig
index ad24193525f5..e9b1f6d4be5d 100644
--- a/trunk/arch/arm/configs/mxs_defconfig
+++ b/trunk/arch/arm/configs/mxs_defconfig
@@ -99,6 +99,8 @@ CONFIG_SPI_MXS=y
 CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_STMP3XXX_RTC_WATCHDOG=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_FB=y