Merge tag 'for-linus' of git://github.com/rustyrussell/linux

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

diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 109b533896b70c0c5e81b3e983dbdb783d10821d..c7e17ceafa6aeca9b83f77edc41a4e372d068585 100644 (file)
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -247,15 +247,4 @@ static struct platform_driver riowd_driver = {
        .remove         = __devexit_p(riowd_remove),
 };
 
-static int __init riowd_init(void)
-{
-       return platform_driver_register(&riowd_driver);
-}
-
-static void __exit riowd_exit(void)
-{
-       platform_driver_unregister(&riowd_driver);
-}
-
-module_init(riowd_init);
-module_exit(riowd_exit);
+module_platform_driver(riowd_driver);