Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[linux-flexiantxendom0-3.2.10.git] / drivers / misc / carma / carma-fpga.c

diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 0cfc5bf..8c279da 100644 (file)
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -1440,23 +1440,8 @@ static struct platform_driver data_of_driver = {
        },
 };
 
-/*
- * Module Init / Exit
- */
-
-static int __init data_init(void)
-{
-       return platform_driver_register(&data_of_driver);
-}
-
-static void __exit data_exit(void)
-{
-       platform_driver_unregister(&data_of_driver);
-}
+module_platform_driver(data_of_driver);
 
 MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
 MODULE_DESCRIPTION("CARMA DATA-FPGA Access Driver");
 MODULE_LICENSE("GPL");
-
-module_init(data_init);
-module_exit(data_exit);