Build fix for n800_defconfig

Just updated from the latest header file.

Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 6793869fcf58599cf15c62e533818b0e23ec9808..682d40221d9c44f3bd495bcc75e088b8a6b7a70d 100644 (file)
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2004 MontaVista Software, Inc.
  * Copyright (C) 2004 Texas Instruments.
- * Copyright (C) 2007 Nokia Corporation.
+ * Copyright (C) 2007-2008 Nokia Corporation.
  *
  * Contact: Sakari Ailus <sakari.ailus@nokia.com>
  *
@@ -997,8 +997,8 @@ static int vidioc_querycap(struct file *file, void *fh,
        return 0;
 }
 
-static int vidioc_enum_fmt_cap(struct file *file, void *fh,
-                              struct v4l2_fmtdesc *f)
+static int vidioc_enum_fmt_vid_cap(struct file *file, void *fh,
+                                  struct v4l2_fmtdesc *f)
 {
        struct omap24xxcam_fh *ofh = fh;
        struct omap24xxcam_device *cam = ofh->cam;
@@ -1009,8 +1009,8 @@ static int vidioc_enum_fmt_cap(struct file *file, void *fh,
        return rval;
 }
 
-static int vidioc_g_fmt_cap(struct file *file, void *fh,
-                           struct v4l2_format *f)
+static int vidioc_g_fmt_vid_cap(struct file *file, void *fh,
+                               struct v4l2_format *f)
 {
        struct omap24xxcam_fh *ofh = fh;
        struct omap24xxcam_device *cam = ofh->cam;
@@ -1023,8 +1023,8 @@ static int vidioc_g_fmt_cap(struct file *file, void *fh,
        return rval;
 }
 
-static int vidioc_s_fmt_cap(struct file *file, void *fh,
-                           struct v4l2_format *f)
+static int vidioc_s_fmt_vid_cap(struct file *file, void *fh,
+                               struct v4l2_format *f)
 {
        struct omap24xxcam_fh *ofh = fh;
        struct omap24xxcam_device *cam = ofh->cam;
@@ -1048,13 +1048,13 @@ out:
        }
 
        memset(f, 0, sizeof(*f));
-       vidioc_g_fmt_cap(file, fh, f);
+       vidioc_g_fmt_vid_cap(file, fh, f);
 
        return rval;
 }
 
-static int vidioc_try_fmt_cap(struct file *file, void *fh,
-                             struct v4l2_format *f)
+static int vidioc_try_fmt_vid_cap(struct file *file, void *fh,
+                                 struct v4l2_format *f)
 {
        struct omap24xxcam_fh *ofh = fh;
        struct omap24xxcam_device *cam = ofh->cam;
@@ -1608,6 +1608,28 @@ static int omap24xxcam_resume(struct platform_device *pdev)
 }
 #endif /* CONFIG_PM */
 
+static const struct v4l2_ioctl_ops omap24xxcam_ioctl_fops = {
+       .vidioc_querycap        = vidioc_querycap,
+       .vidioc_enum_fmt_vid_cap        = vidioc_enum_fmt_vid_cap,
+       .vidioc_g_fmt_vid_cap   = vidioc_g_fmt_vid_cap,
+       .vidioc_s_fmt_vid_cap   = vidioc_s_fmt_vid_cap,
+       .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
+       .vidioc_reqbufs         = vidioc_reqbufs,
+       .vidioc_querybuf        = vidioc_querybuf,
+       .vidioc_qbuf            = vidioc_qbuf,
+       .vidioc_dqbuf           = vidioc_dqbuf,
+       .vidioc_streamon        = vidioc_streamon,
+       .vidioc_streamoff       = vidioc_streamoff,
+       .vidioc_enum_input      = vidioc_enum_input,
+       .vidioc_g_input         = vidioc_g_input,
+       .vidioc_s_input         = vidioc_s_input,
+       .vidioc_queryctrl       = vidioc_queryctrl,
+       .vidioc_g_ctrl          = vidioc_g_ctrl,
+       .vidioc_s_ctrl          = vidioc_s_ctrl,
+       .vidioc_g_parm          = vidioc_g_parm,
+       .vidioc_s_parm          = vidioc_s_parm,
+};
+
 /*
  *
  * Camera device (i.e. /dev/video).
@@ -1641,33 +1663,14 @@ static int omap24xxcam_device_register(struct v4l2_int_device *s)
        }
        vfd->release = video_device_release;
 
-       vfd->dev = cam->dev;
+       vfd->parent = cam->dev;
 
        strlcpy(vfd->name, CAM_NAME, sizeof(vfd->name));
-       vfd->type                = VID_TYPE_CAPTURE | VID_TYPE_CHROMAKEY;
+       vfd->vfl_type            = VID_TYPE_CAPTURE | VID_TYPE_CHROMAKEY;
        vfd->fops                = &omap24xxcam_fops;
        vfd->priv                = cam;
        vfd->minor               = -1;
-
-       vfd->vidioc_querycap     = vidioc_querycap;
-       vfd->vidioc_enum_fmt_cap = vidioc_enum_fmt_cap;
-       vfd->vidioc_g_fmt_cap    = vidioc_g_fmt_cap;
-       vfd->vidioc_s_fmt_cap    = vidioc_s_fmt_cap;
-       vfd->vidioc_try_fmt_cap  = vidioc_try_fmt_cap;
-       vfd->vidioc_reqbufs      = vidioc_reqbufs;
-       vfd->vidioc_querybuf     = vidioc_querybuf;
-       vfd->vidioc_qbuf         = vidioc_qbuf;
-       vfd->vidioc_dqbuf        = vidioc_dqbuf;
-       vfd->vidioc_streamon     = vidioc_streamon;
-       vfd->vidioc_streamoff    = vidioc_streamoff;
-       vfd->vidioc_enum_input   = vidioc_enum_input;
-       vfd->vidioc_g_input      = vidioc_g_input;
-       vfd->vidioc_s_input      = vidioc_s_input;
-       vfd->vidioc_queryctrl    = vidioc_queryctrl;
-       vfd->vidioc_g_ctrl       = vidioc_g_ctrl;
-       vfd->vidioc_s_ctrl       = vidioc_s_ctrl;
-       vfd->vidioc_g_parm       = vidioc_g_parm;
-       vfd->vidioc_s_parm       = vidioc_s_parm;
+       vfd->ioctl_ops           = &omap24xxcam_ioctl_fops;
 
        omap24xxcam_hwinit(cam);