From: Komal Shah <komal_shah802003@yahoo.com>
Date: Tue, 11 Oct 2005 17:35:56 +0000 (+0300)
Subject: [PATCH] ARM: OMAP: omap2420 defconfig with Watchdog support
X-Git-Tag: v2.6.15-omap2~154
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8fb96fb8acd5e476977fd1c553edb41811b4fb74;p=linux-2.6-omap-h63xx.git

[PATCH] ARM: OMAP: omap2420 defconfig with Watchdog support

omap2420 defconfig with Watchdog support.

Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/configs/omap_h4_2420_defconfig b/arch/arm/configs/omap_h4_2420_defconfig
index 64fe5081126..153d59fd84b 100644
--- a/arch/arm/configs/omap_h4_2420_defconfig
+++ b/arch/arm/configs/omap_h4_2420_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.14-rc1-omap1
-# Tue Oct  4 22:45:14 2005
+# Tue Oct 11 22:28:40 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -534,7 +534,15 @@ CONFIG_UNIX98_PTYS=y
 #
 # Watchdog Cards
 #
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_OMAP_WATCHDOG=y
+# CONFIG_OMAP_RNG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
 # CONFIG_DTLK is not set