diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-05-29 05:00:34 -0400 |
---|---|---|
committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-05-29 05:00:34 -0400 |
commit | 2436e8aa8abef2536dc3bfb554f8dcb3a8b07560 (patch) | |
tree | 7e5e4b6447a2c3864ac1a5a2cf619881d8d069d5 /include | |
parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
parent | 591a0ac7f14aae6bf11b1cb6b5a68480bd644ddb (diff) |
Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into linux-fbdev/for-3.10-fixes
Pull Tomi fixes for ps3fb and omap2
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/video/omapdss.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 62ca9a77c1d6..aeb4e9a0c5d1 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h | |||
@@ -748,6 +748,7 @@ struct omap_dss_driver { | |||
748 | }; | 748 | }; |
749 | 749 | ||
750 | enum omapdss_version omapdss_get_version(void); | 750 | enum omapdss_version omapdss_get_version(void); |
751 | bool omapdss_is_initialized(void); | ||
751 | 752 | ||
752 | int omap_dss_register_driver(struct omap_dss_driver *); | 753 | int omap_dss_register_driver(struct omap_dss_driver *); |
753 | void omap_dss_unregister_driver(struct omap_dss_driver *); | 754 | void omap_dss_unregister_driver(struct omap_dss_driver *); |