Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / dt3155v4l / dt3155v4l.c

diff --git a/drivers/staging/dt3155v4l/dt3155v4l.c b/drivers/staging/dt3155v4l/dt3155v4l.c
index b996697e7eb2095cb2eafa3abe4dd8ee87745b60..15d7efeed2925beeacc68bd77b7423acd27cf418 100644 (file)
--- a/drivers/staging/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/dt3155v4l/dt3155v4l.c
@@ -876,9 +876,6 @@ static const struct v4l2_ioctl_ops dt3155_ioctl_ops = {
        .vidioc_s_crop = dt3155_ioc_s_crop,
        .vidioc_enum_framesizes = dt3155_ioc_enum_framesizes,
        .vidioc_enum_frameintervals = dt3155_ioc_enum_frameintervals,
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-       .vidiocgmbuf = iocgmbuf,
-#endif
 */
 };