diff options
author | Florian Fainelli <florian@openwrt.org> | 2009-06-09 21:28:15 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2009-06-09 21:28:15 +0000 |
commit | 1726b10d08759b1aacb1a57f422350b2949f92e9 (patch) | |
tree | 7437cca3b9dcbbc87a6f623b509fa343f9e54509 /target/linux/brcm63xx/config-2.6.27 | |
parent | 3339e02ed8aa70d7afae6346c3172db10072fcab (diff) | |
download | upstream-1726b10d08759b1aacb1a57f422350b2949f92e9.tar.gz upstream-1726b10d08759b1aacb1a57f422350b2949f92e9.tar.bz2 upstream-1726b10d08759b1aacb1a57f422350b2949f92e9.zip |
[brcm63xx] fix the watchdog driver and enable it by default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16394 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/config-2.6.27')
-rw-r--r-- | target/linux/brcm63xx/config-2.6.27 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27 index 255080286b..83af14f8ae 100644 --- a/target/linux/brcm63xx/config-2.6.27 +++ b/target/linux/brcm63xx/config-2.6.27 @@ -19,6 +19,7 @@ CONFIG_BCM63XX_CPU_6348=y CONFIG_BCM63XX_CPU_6358=y CONFIG_BCM63XX_ENET=y CONFIG_BCM63XX_PHY=y +CONFIG_BCM63XX_WDT=y CONFIG_BITREVERSE=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_BOARD_BCM963XX=y @@ -59,7 +60,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y # CONFIG_CPU_VR41XX is not set CONFIG_CRAMFS=y CONFIG_CSRC_R4K=y -CONFIG_DEFAULT_BIC=y CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_DEADLINE is not set CONFIG_DEFAULT_IOSCHED="cfq" @@ -106,7 +106,6 @@ CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y CONFIG_IOSCHED_CFQ=y # CONFIG_IOSCHED_DEADLINE is not set -CONFIG_IP_MROUTE=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_IRQ_CPU=y @@ -198,12 +197,11 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_TICK_ONESHOT=y CONFIG_TRAD_SIGNALS=y CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_SUPPORT=y # CONFIG_VGASTATE is not set # CONFIG_VIA_RHINE is not set CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_WATCHDOG is not set +CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_ZONE_DMA_FLAG=0 |