define panic_on_unrecovered_nmi in the southbridge driver and fix watchdog init messa...

SVN-Revision: 20134

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 0281485c5d386630633ef79904e4083fc5fa8400..21caed8b76ab18af33612ce579ccf7cf1234464e 100644 (file)
--- 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 3ced6c9a2199b3f48fc13c3638bb50a47458a333..2572c0e2cb7aac9e2d28e15de59f643cf6c00b99 100644 (file)
--- 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;
 }