diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-05 11:11:50 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-11-05 11:11:50 +0200 |
| commit | 9296dbd79efb3a754f06d71510cc47af7eff0bee (patch) | |
| tree | 79e1f93bb4e95bf3075acf4a12f780b788ffb0ef /include/video | |
| parent | f8fb7d7b7bbaa9336aa44675f56fd2f329516200 (diff) | |
| parent | ffc81fc5f3f6070820cb7ef885daa37545291e97 (diff) | |
| download | linux-3.10-9296dbd79efb3a754f06d71510cc47af7eff0bee.tar.gz linux-3.10-9296dbd79efb3a754f06d71510cc47af7eff0bee.tar.bz2 linux-3.10-9296dbd79efb3a754f06d71510cc47af7eff0bee.zip | |
Merge branch '3.8/misc-2'
Merge omapdss miscellaneous patches.
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/omapdss.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index f39e6aabce2..b1248c2d36e 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -158,7 +158,6 @@ enum omap_display_caps { enum omap_dss_display_state { OMAP_DSS_DISPLAY_DISABLED = 0, OMAP_DSS_DISPLAY_ACTIVE, - OMAP_DSS_DISPLAY_SUSPENDED, }; enum omap_dss_audio_state { @@ -682,8 +681,6 @@ struct omap_dss_driver { int (*enable)(struct omap_dss_device *display); void (*disable)(struct omap_dss_device *display); - int (*suspend)(struct omap_dss_device *display); - int (*resume)(struct omap_dss_device *display); int (*run_test)(struct omap_dss_device *display, int test); int (*update)(struct omap_dss_device *dssdev, @@ -741,6 +738,8 @@ struct omap_dss_driver { }; +enum omapdss_version omapdss_get_version(void); + int omap_dss_register_driver(struct omap_dss_driver *); void omap_dss_unregister_driver(struct omap_dss_driver *); @@ -750,6 +749,7 @@ void omap_dss_put_device(struct omap_dss_device *dssdev); struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from); struct omap_dss_device *omap_dss_find_device(void *data, int (*match)(struct omap_dss_device *dssdev, void *data)); +const char *omapdss_get_default_display_name(void); int omap_dss_start_device(struct omap_dss_device *dssdev); void omap_dss_stop_device(struct omap_dss_device *dssdev); |