diff --git a/[refs] b/[refs] index a6e7979e589f..b49cb3530878 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 853525d7785761d2d9c121b41326ab19d3af4a22 +refs/heads/master: b63c97f5184684c841be84ec80928e3c5fe57fbe diff --git a/trunk/drivers/video/omap2/omapfb/omapfb.h b/trunk/drivers/video/omap2/omapfb/omapfb.h index f7c9c739e5ef..4ae0b64b3f43 100644 --- a/trunk/drivers/video/omap2/omapfb/omapfb.h +++ b/trunk/drivers/video/omap2/omapfb/omapfb.h @@ -105,6 +105,9 @@ void omapfb_remove_sysfs(struct omapfb2_device *fbdev); int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg); +int omapfb_update_window(struct fb_info *fbi, + u32 x, u32 y, u32 w, u32 h); + int dss_mode_to_fb_mode(enum omap_color_mode dssmode, struct fb_var_screeninfo *var);