Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (255 commits)
  [media] radio-aimslab.c: Fix gcc 4.5+ bug
  [media] cx25821: Fix compilation breakage due to BKL dependency
  [media] v4l2-compat-ioctl32: fix compile warning
  [media] zoran: fix compiler warning
  [media] tda18218: fix compile warning
  [media] ngene: fix compile warning
  [media] DVB: IR support for TechnoTrend CT-3650
  [media] cx23885, cimax2.c: Fix case of two CAM insertion irq
  [media] ir-nec-decoder: fix repeat key issue
  [media] staging: se401 depends on USB
  [media] staging: usbvideo/vicam depends on USB
  [media] soc_camera: Add the ability to bind regulators to soc_camedra devices
  [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor
  [media] v4l: soc-camera: switch to .unlocked_ioctl
  [media] v4l: ov772x: simplify pointer dereference
  [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
  [media] ov9640: use macro to request OmniVision OV9640 sensor private data
  [media] ivtv-i2c: Fix two warnings
  [media] staging/lirc: Update lirc TODO files
  [media] cx88: Remove the obsolete i2c_adapter.id field
  ...

1 files changed, 0 insertions, 32 deletions

diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index d246910129e8..0ac5c619aecf 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1129,35 +1129,6 @@ static int vidioc_g_chip_ident(struct file *file, void *__fh,
                         core, g_chip_ident, chip);
 }
 
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-static int vidiocgmbuf(struct file *file, void *__fh, struct video_mbuf *mbuf)
-{
-        struct saa7146_fh *fh = __fh;
-        struct videobuf_queue *q = &fh->video_q;
-        int err, i;
-
-        /* fixme: number of capture buffers and sizes for v4l apps */
-        int gbuffers = 2;
-        int gbufsize = 768 * 576 * 4;
-
-        DEB_D(("VIDIOCGMBUF \n"));
-
-        q = &fh->video_q;
-        err = videobuf_mmap_setup(q, gbuffers, gbufsize,
-                        V4L2_MEMORY_MMAP);
-        if (err < 0)
-                return err;
-
-        gbuffers = err;
-        memset(mbuf, 0, sizeof(*mbuf));
-        mbuf->frames = gbuffers;
-        mbuf->size   = gbuffers * gbufsize;
-        for (i = 0; i < gbuffers; i++)
-                mbuf->offsets[i] = i * gbufsize;
-        return 0;
-}
-#endif
-
 const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = {
         .vidioc_querycap             = vidioc_querycap,
         .vidioc_enum_fmt_vid_cap     = vidioc_enum_fmt_vid_cap,
@@ -1186,9 +1157,6 @@ const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = {
         .vidioc_streamon             = vidioc_streamon,
         .vidioc_streamoff            = vidioc_streamoff,
         .vidioc_g_parm               = vidioc_g_parm,
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        .vidiocgmbuf                 = vidiocgmbuf,
-#endif
 };
 
 /*********************************************************************************/