瀏覽代碼

define panic_on_unrecovered_nmi in the southbridge driver and fix watchdog init message Patch from Bernhard Loos.

SVN-Revision: 20134
Florian Fainelli 16 年之前
父節點
當前提交
2e8a547887

+ 2 - 0
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;
 		return err;
 	}
 	}
 
 
+	panic_on_unrecovered_nmi = 1;
+
 	err = platform_device_register(&rdc321x_gpio_device);
 	err = platform_device_register(&rdc321x_gpio_device);
 	if (err) {
 	if (err) {
 		dev_err(&pdev->dev, "failed to register gpiochip\n");
 		dev_err(&pdev->dev, "failed to register gpiochip\n");

+ 1 - 1
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;
 	panic_on_unrecovered_nmi = 1;
-	dev_info(&pdev->dev, "watchdog inig success\n");
+	dev_info(&pdev->dev, "watchdog init success\n");
 
 
 	return 0;
 	return 0;
 }
 }