summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorVaibhav Hiremath <hvaibhav@ti.com>2010-04-11 10:50:23 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 12:58:11 -0300
commit72fcf2a8daac43f8e3bce62a1c1124859b323006 (patch)
tree3d414c0acdf55fc0bbb19925ca32b4b886d9f2e5 /drivers/media
parent5c7ab6348e7b3fcca2b8ee548306c774472971e2 (diff)
downloadlinux-72fcf2a8daac43f8e3bce62a1c1124859b323006.tar.gz
linux-72fcf2a8daac43f8e3bce62a1c1124859b323006.tar.bz2
linux-72fcf2a8daac43f8e3bce62a1c1124859b323006.zip
V4L/DVB: omap_vout:V4L2 Display: Changed enum return type to int
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Muralidharan Karicheri <mkaricheri@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/omap/omap_vout.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index f2100671851c..4c0ab499228b 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/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;