diff --git a/[refs] b/[refs] index 3917d62bd9b2..74c7cd1aa344 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fbf1bb02d1005203e39ca7bd7aa7afcd2909c4b +refs/heads/master: 3375483e91fd7a3fc0f0ab79f279014c45d8e07f diff --git a/trunk/drivers/video/omap2/dss/dss.h b/trunk/drivers/video/omap2/dss/dss.h index ff7ac35ec282..7018351bae00 100644 --- a/trunk/drivers/video/omap2/dss/dss.h +++ b/trunk/drivers/video/omap2/dss/dss.h @@ -395,11 +395,6 @@ void dispc_enable_cpr(enum omap_channel channel, bool enable); void dispc_set_cpr_coef(enum omap_channel channel, struct omap_dss_cpr_coefs *coefs); -void dispc_set_plane_ba0(enum omap_plane plane, u32 paddr); -void dispc_set_plane_ba1(enum omap_plane plane, u32 paddr); -void dispc_set_plane_pos(enum omap_plane plane, u16 x, u16 y); -void dispc_set_plane_size(enum omap_plane plane, u16 width, u16 height); - void dispc_enable_gamma_table(bool enable); int dispc_setup_plane(enum omap_plane plane, u32 paddr, u16 screen_width,