Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6

[mirror_ubuntu-artful-kernel.git] / drivers / watchdog / bcm63xx_wdt.c

diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
index 8379dc32fd908f9bf0e76532ca27d847ca145fd3..551880bfd629c8043fa6459cb2ae969b3a0b2d47 100644 (file)
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/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>");