From 0b73372d8592dd3bc89f8f1141192d43a0e982a7 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Fri, 29 Jun 2012 11:14:44 +0200
Subject: [PATCH] --- yaml --- r: 315957 b: refs/heads/master c:
 5a135f3c72c5bc738a29629d81a99c981b17a736 h: refs/heads/master i:   315955:
 5e88771ebc365e5754fafda574a52713bd529e44 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/watchdog/bcm63xx_wdt.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e2e0a4456783..f5a7f8458c62 100644
--- 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
index 8379dc32fd90..551880bfd629 100644
--- 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>");