diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-03-11 09:16:55 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-03-11 09:16:55 +0000 |
| commit | 2e8a5478877ca8fef84b2c0f8dc15536363b102a (patch) | |
| tree | dfe35c0031f5a5359d87c748df9a82ada1a0fe9e /target/linux | |
| parent | 5601865155862fc12812a04bf4e0440e4bc01716 (diff) | |
| download | master-31e0f0ae-2e8a5478877ca8fef84b2c0f8dc15536363b102a.tar.gz master-31e0f0ae-2e8a5478877ca8fef84b2c0f8dc15536363b102a.tar.bz2 master-31e0f0ae-2e8a5478877ca8fef84b2c0f8dc15536363b102a.zip | |
define panic_on_unrecovered_nmi in the southbridge driver and fix watchdog init message Patch from Bernhard Loos.
SVN-Revision: 20134
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/pci.c | 2 | ||||
| -rw-r--r-- | target/linux/rdc/files-2.6.30/drivers/watchdog/rdc321x_wdt.c | 2 |
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; } |