diff options
| author | G, Manjunath Kondaiah <manjugk@ti.com> | 2010-10-29 16:19:10 +0530 |
|---|---|---|
| committer | G, Manjunath Kondaiah <manjugk@ti.com> | 2010-10-29 16:19:32 +0530 |
| commit | 29e973b87c89e22a8ee95ee38afb0039a395d50d (patch) | |
| tree | 0709d8db8e4e1fd445c944d0b157104d35b5e50f /drivers/video/omap2/dss/dss.h | |
| parent | 08e5ff41d66926d88ef166ca53f6972753fbb360 (diff) | |
| parent | 80b87dcb1b6167f303e617fdb7c70d814b2468d5 (diff) | |
Merge branch 'Display changes' into L24.11ti-2.6.35-omap4-L24.11-p1
Diffstat (limited to 'drivers/video/omap2/dss/dss.h')
| -rw-r--r-- | drivers/video/omap2/dss/dss.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h index 6e51020b99f5..569d0b2012e3 100644 --- a/drivers/video/omap2/dss/dss.h +++ b/drivers/video/omap2/dss/dss.h @@ -226,7 +226,7 @@ struct bus_type *dss_get_bus(void); struct regulator *dss_get_vdds_dsi(void); struct regulator *dss_get_vdds_sdi(void); struct regulator *dss_get_vdda_dac(void); -void dss_opt_clock_enable(void); +int dss_opt_clock_enable(void); void dss_opt_clock_disable(void); void save_all_ctx(void); void restore_all_ctx(void); @@ -462,7 +462,7 @@ int dispc_setup_plane(enum omap_plane plane, enum omap_dss_rotation_type rotation_type, u8 rotation, bool mirror, u8 global_alpha, enum omap_channel channel, - u32 puv_addr, u16 pic_width, u16 pic_height); + u32 puv_addr, u16 pic_height); bool dispc_go_busy(enum omap_channel channel); void dispc_go(enum omap_channel channel); |