Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

[mv-sheeva.git] / drivers / watchdog / cpwd.c

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 1e013e8457b7c1ee24c7d8731ba48c7ab4357583..1b793dfd868fdbe009c244e3cf0a5150bc431035 100644 (file)
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -687,15 +687,4 @@ static struct platform_driver cpwd_driver = {
        .remove         = __devexit_p(cpwd_remove),
 };
 
-static int __init cpwd_init(void)
-{
-       return platform_driver_register(&cpwd_driver);
-}
-
-static void __exit cpwd_exit(void)
-{
-       platform_driver_unregister(&cpwd_driver);
-}
-
-module_init(cpwd_init);
-module_exit(cpwd_exit);
+module_platform_driver(cpwd_driver);