aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-03-20 17:45:41 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-03-20 17:45:41 +0000
commitea89aacf526e3dd1572220325a3afed951a6059b (patch)
tree0105e8980118348074711ee43fc069b0540f7e81
parentea66b2355db5f422e5654df7936d28967b1cf373 (diff)
downloadupstream-ea89aacf526e3dd1572220325a3afed951a6059b.tar.gz
upstream-ea89aacf526e3dd1572220325a3afed951a6059b.tar.bz2
upstream-ea89aacf526e3dd1572220325a3afed951a6059b.zip
do not set panic_on_unrecovered_nmi in watchdog, already set in southbridge driver, thanks rtz
SVN-Revision: 20324
-rw-r--r--target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c b/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c
index 2572c0e2cb..6949179495 100644
--- a/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c
+++ b/target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c
@@ -243,7 +243,6 @@ static int __init rdc321x_wdt_probe(struct platform_device *pdev)
return err;
}
- panic_on_unrecovered_nmi = 1;
dev_info(&pdev->dev, "watchdog init success\n");
return 0;