---

yaml --- r: 370621 b: refs/heads/master c: 656c284 h: refs/heads/master i: 370619: 5f8ecd4 v: v3
git-mirror · Apr 1, 2013 · 1c930f5 · 1c930f5
1 parent 573d403
commit 1c930f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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