summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-11 09:16:55 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-11 09:16:55 +0000
commite9601431a5ef3df56b964f46129a3634bf6c2880 (patch)
tree7880ee09fde3db8c888ac529433889b7d371ea20 /target
parentfdc060ab009268f023a86174d05d976136a8b608 (diff)
[rdc] define panic_on_unrecovered_nmi in the southbridge driver and fix watchdog init message
Patch from Bernhard Loos. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20134 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c2
-rw-r--r--target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c
index 0281485c5..21caed8b7 100644
--- a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c
+++ b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c
@@ -81,6 +81,8 @@ static int __devinit rdc321x_sb_probe(struct pci_dev *pdev, const struct pci_dev
return err;
}
+ panic_on_unrecovered_nmi = 1;
+
err = platform_device_register(&rdc321x_gpio_device);
if (err) {
dev_err(&pdev->dev, "failed to register gpiochip\n");
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 3ced6c9a2..2572c0e2c 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
@@ -244,7 +244,7 @@ static int __init rdc321x_wdt_probe(struct platform_device *pdev)
}
panic_on_unrecovered_nmi = 1;
- dev_info(&pdev->dev, "watchdog inig success\n");
+ dev_info(&pdev->dev, "watchdog init success\n");
return 0;
}