aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/config-3.6
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-11-24 20:24:27 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-11-24 20:24:27 +0000
commit264873b3c551b2577a953d34b04107bda47fddce (patch)
tree12494fdcd20bc57bd5cba0764bbdadf11af772a9 /target/linux/brcm47xx/config-3.6
parentc62d86ecb87f695d9065a29e6ec4cd49ea5f21ad (diff)
downloadupstream-264873b3c551b2577a953d34b04107bda47fddce.tar.gz
upstream-264873b3c551b2577a953d34b04107bda47fddce.tar.bz2
upstream-264873b3c551b2577a953d34b04107bda47fddce.zip
brcm47xx: watchdog: deactivate NOWAYOUT.
In the old configuration the SoC issued a reboot if the watchdog was killed also if it was kill with TERM and not KILL. This will fix #11724. SVN-Revision: 34324
Diffstat (limited to 'target/linux/brcm47xx/config-3.6')
-rw-r--r--target/linux/brcm47xx/config-3.61
1 files changed, 0 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/config-3.6 b/target/linux/brcm47xx/config-3.6
index 4859a5b6d1..478ba847c5 100644
--- a/target/linux/brcm47xx/config-3.6
+++ b/target/linux/brcm47xx/config-3.6
@@ -145,5 +145,4 @@ CONFIG_USB_ARCH_HAS_XHCI=y
# CONFIG_USB_HCD_SSB is not set
CONFIG_USB_SUPPORT=y
CONFIG_WATCHDOG_CORE=y
-CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_ZONE_DMA_FLAG=0