summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 0281485c5d..21caed8b76 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 3ced6c9a21..2572c0e2cb 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;
}