From: Florian Fainelli Date: Sat, 20 Mar 2010 17:45:41 +0000 (+0000) Subject: do not set panic_on_unrecovered_nmi in watchdog, already set in southbridge driver... X-Git-Tag: reboot~20574 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ea89aacf526e3dd1572220325a3afed951a6059b;p=oweals%2Fopenwrt.git do not set panic_on_unrecovered_nmi in watchdog, already set in southbridge driver, thanks rtz SVN-Revision: 20324 --- 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;