From 6f7f12db9592a326e7011df62d41f3ee8b2f3969 Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath Date: Sun, 11 Apr 2010 10:50:23 -0300 Subject: [PATCH] --- yaml --- r: 193053 b: refs/heads/master c: 72fcf2a8daac43f8e3bce62a1c1124859b323006 h: refs/heads/master i: 193051: 7be89c74c77b5e093b95a7683e579dbc6edd8c93 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap/omap_vout.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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;