aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/omap2/dss/core.c7
-rw-r--r--include/video/omapdss.h3
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 3a8047a9e76b..5fbf9e845fe1 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -54,6 +54,9 @@ unsigned int dss_debug;
54module_param_named(debug, dss_debug, bool, 0644); 54module_param_named(debug, dss_debug, bool, 0644);
55#endif 55#endif
56 56
57static int omap_dss_register_device(struct omap_dss_device *);
58static void omap_dss_unregister_device(struct omap_dss_device *);
59
57/* REGULATORS */ 60/* REGULATORS */
58 61
59struct regulator *dss_get_vdds_dsi(void) 62struct regulator *dss_get_vdds_dsi(void)
@@ -480,7 +483,7 @@ static void omap_dss_dev_release(struct device *dev)
480 reset_device(dev, 0); 483 reset_device(dev, 0);
481} 484}
482 485
483int omap_dss_register_device(struct omap_dss_device *dssdev) 486static int omap_dss_register_device(struct omap_dss_device *dssdev)
484{ 487{
485 static int dev_num; 488 static int dev_num;
486 489
@@ -494,7 +497,7 @@ int omap_dss_register_device(struct omap_dss_device *dssdev)
494 return device_register(&dssdev->dev); 497 return device_register(&dssdev->dev);
495} 498}
496 499
497void omap_dss_unregister_device(struct omap_dss_device *dssdev) 500static void omap_dss_unregister_device(struct omap_dss_device *dssdev)
498{ 501{
499 device_unregister(&dssdev->dev); 502 device_unregister(&dssdev->dev);
500} 503}
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index f0789292c7c2..4beaee19f5f9 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -523,9 +523,6 @@ struct omap_dss_driver {
523int omap_dss_register_driver(struct omap_dss_driver *); 523int omap_dss_register_driver(struct omap_dss_driver *);
524void omap_dss_unregister_driver(struct omap_dss_driver *); 524void omap_dss_unregister_driver(struct omap_dss_driver *);
525 525
526int omap_dss_register_device(struct omap_dss_device *);
527void omap_dss_unregister_device(struct omap_dss_device *);
528
529void omap_dss_get_device(struct omap_dss_device *dssdev); 526void omap_dss_get_device(struct omap_dss_device *dssdev);
530void omap_dss_put_device(struct omap_dss_device *dssdev); 527void omap_dss_put_device(struct omap_dss_device *dssdev);
531#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL) 528#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL)