projects / openwrt / svn-archive / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 823d1f8)
Merge r15809 to 8.09
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 13 May 2009 00:13:42 +0000 (00:13 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 13 May 2009 00:13:42 +0000 (00:13 +0000)
SVN-Revision: 15810

target/linux/generic-2.4/config-default patch | blob | history

diff --git a/target/linux/generic-2.4/config-default b/target/linux/generic-2.4/config-default
index 23697360e7bd7983e32f2d8d9cb914d4f4b81e4b..aaaec7c93960693717d134954f6849830090af11 100644 (file)
--- 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
OpenWrt development branches, manually converted from SVN.