Merge branch 'stable-3.2' into pandora-3.2-stable

[pandora-kernel.git] / include / video / omapdss.h

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 6582c45..4a64aa5 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -651,6 +651,8 @@ struct omap_overlay *omap_dss_get_overlay(int num);
 void omapdss_default_get_resolution(struct omap_dss_device *dssdev,
                u16 *xres, u16 *yres);
 int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev);
+void omapdss_default_get_timings(struct omap_dss_device *dssdev,
+               struct omap_video_timings *timings);
 
 typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);
 int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);