From 1d71cac8ada0a59aad42db655933fa39deb45b36 Mon Sep 17 00:00:00 2001
From: Timo Kokkonen <timo.t.kokkonen@nokia.com>
Date: Fri, 28 Aug 2009 11:24:10 -0700
Subject: [PATCH] --- yaml --- r: 163128 b: refs/heads/master c:
 ac2a048c3cc7c76d848093298ffa452558a7b2e8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4808c662f8db..b33d78b013d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8870d946e1ff459453296733f9f389a3a5bc2983
+refs/heads/master: ac2a048c3cc7c76d848093298ffa452558a7b2e8
diff --git a/trunk/arch/arm/configs/rx51_defconfig b/trunk/arch/arm/configs/rx51_defconfig
index f238df66efd4..e7e31332c62a 100644
--- a/trunk/arch/arm/configs/rx51_defconfig
+++ b/trunk/arch/arm/configs/rx51_defconfig
@@ -1006,6 +1006,7 @@ CONFIG_WATCHDOG=y
 #
 # CONFIG_SOFT_WATCHDOG is not set
 CONFIG_OMAP_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
 
 #
 # USB-based Watchdog Cards