Merge branch 'omap1-part2' into omap1

[linux.git] / drivers / video / omap / lcd_ams_delta.c

diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
index 73b211b92a39dc935c89b067af72890e48fef0af..0e71e2898b18fbbc57a9e9427b5e2e86ada87f55 100644 (file)
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -211,7 +211,7 @@ static int ams_delta_panel_resume(struct platform_device *pdev)
        return 0;
 }
 
-struct platform_driver ams_delta_panel_driver = {
+static struct platform_driver ams_delta_panel_driver = {
        .probe          = ams_delta_panel_probe,
        .remove         = ams_delta_panel_remove,
        .suspend        = ams_delta_panel_suspend,
@@ -222,15 +222,4 @@ struct platform_driver ams_delta_panel_driver = {
        },
 };
 
-static int __init ams_delta_panel_drv_init(void)
-{
-       return platform_driver_register(&ams_delta_panel_driver);
-}
-
-static void __exit ams_delta_panel_drv_cleanup(void)
-{
-       platform_driver_unregister(&ams_delta_panel_driver);
-}
-
-module_init(ams_delta_panel_drv_init);
-module_exit(ams_delta_panel_drv_cleanup);
+module_platform_driver(ams_delta_panel_driver);