---

yaml --- r: 315957 b: refs/heads/master c: 5a135f3 h: refs/heads/master i: 315955: 5e88771 v: v3
git-mirror · Jul 23, 2012 · 0b73372 · 0b73372
1 parent a5ce069
commit 0b73372
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bff23431fe7e2eba939fe4cdaa78d94a4d9497f7
+refs/heads/master: 5a135f3c72c5bc738a29629d81a99c981b17a736
diff --git a/trunk/drivers/watchdog/bcm63xx_wdt.c b/trunk/drivers/watchdog/bcm63xx_wdt.c
@@ -302,7 +302,7 @@ static void bcm63xx_wdt_shutdown(struct platform_device *pdev)
 	bcm63xx_wdt_pause();
 }
 
-static struct platform_driver bcm63xx_wdt = {
+static struct platform_driver bcm63xx_wdt_driver = {
 	.probe	= bcm63xx_wdt_probe,
 	.remove = __devexit_p(bcm63xx_wdt_remove),
 	.shutdown = bcm63xx_wdt_shutdown,
@@ -312,7 +312,7 @@ static struct platform_driver bcm63xx_wdt = {
 	}
 };
 
-module_platform_driver(bcm63xx_wdt);
+module_platform_driver(bcm63xx_wdt_driver);
 
 MODULE_AUTHOR("Miguel Gaio <miguel.gaio@efixo.com>");
 MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");