From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Sun, 11 Apr 2010 13:50:23 +0000 (-0300)
Subject: V4L/DVB: omap_vout:V4L2 Display: Changed enum return type to int
X-Git-Tag: v2.6.35-rc1~480^2~112
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=72fcf2a8daac43f8e3bce62a1c1124859b323006;p=karo-tx-linux.git

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>
---

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;