From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 13 May 2009 00:13:42 +0000 (+0000)
Subject: Merge r15809 to 8.09
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2413ca6b9293b90e294d2bd7cb4c977188426c81;p=openwrt%2Fsvn-archive%2Farchive.git

Merge r15809 to 8.09

SVN-Revision: 15810
---

diff --git a/target/linux/generic-2.4/config-default b/target/linux/generic-2.4/config-default
index 23697360e7..aaaec7c939 100644
--- a/target/linux/generic-2.4/config-default
+++ b/target/linux/generic-2.4/config-default
@@ -726,7 +726,7 @@ CONFIG_VLAN_8021Q=y
 # CONFIG_WAN is not set
 CONFIG_WAN_ROUTER=m
 CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
 # CONFIG_WAVELAN is not set
 # CONFIG_WDT_W83627 is not set
 # CONFIG_X25 is not set