Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[pandora-kernel.git] / drivers / media / video / via-camera.c

diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c
index 222e72d..2f973cd 100644 (file)
--- a/drivers/media/video/via-camera.c
+++ b/drivers/media/video/via-camera.c
@@ -1159,16 +1159,6 @@ out:
        return ret;
 }
 
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-static int viacam_vidiocgmbuf(struct file *filp, void *priv,
-               struct video_mbuf *mbuf)
-{
-       struct via_camera *cam = priv;
-
-       return videobuf_cgmbuf(&cam->vb_queue, mbuf, 6);
-}
-#endif
-
 /* G/S_PARM */
 
 static int viacam_g_parm(struct file *filp, void *priv,
@@ -1249,9 +1239,6 @@ static const struct v4l2_ioctl_ops viacam_ioctl_ops = {
        .vidioc_s_parm          = viacam_s_parm,
        .vidioc_enum_framesizes = viacam_enum_framesizes,
        .vidioc_enum_frameintervals = viacam_enum_frameintervals,
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-       .vidiocgmbuf            = viacam_vidiocgmbuf,
-#endif
 };
 
 /*----------------------------------------------------------------------------*/