diff --git a/[refs] b/[refs]
index 00d8cab4d08e..afbe0082fc70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c7ab6348e7b3fcca2b8ee548306c774472971e2
+refs/heads/master: 72fcf2a8daac43f8e3bce62a1c1124859b323006
diff --git a/trunk/drivers/media/video/omap/omap_vout.c b/trunk/drivers/media/video/omap/omap_vout.c
index f2100671851c..4c0ab499228b 100644
--- a/trunk/drivers/media/video/omap/omap_vout.c
+++ b/trunk/drivers/media/video/omap/omap_vout.c
@@ -622,8 +622,7 @@ static int omap_vout_calculate_offset(struct omap_vout_device *vout)
 /*
  * Convert V4L2 pixel format to DSS pixel format
  */
-static enum omap_color_mode video_mode_to_dss_mode(struct omap_vout_device
-			*vout)
+static int video_mode_to_dss_mode(struct omap_vout_device *vout)
 {
 	struct omap_overlay *ovl;
 	struct omapvideo_info *ovid;