]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] ARM: OMAP: omap2420 defconfig with Watchdog support
authorKomal Shah <komal_shah802003@yahoo.com>
Tue, 11 Oct 2005 17:35:56 +0000 (20:35 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 11 Oct 2005 17:35:56 +0000 (20:35 +0300)
omap2420 defconfig with Watchdog support.

Signed-off-by: Komal Shah <komal_shah802003@yahoo.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/configs/omap_h4_2420_defconfig

index 64fe5081126e4169a2a61628aa293a651497580c..153d59fd84b82a67e88205c1d927183fc919843b 100644 (file)
@@ -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