From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Sun, 10 Sep 2006 12:31:37 +0000 (-0300)
Subject: V4L/DVB (4494a): Fix compilation when V4L1 support is not present
X-Git-Tag: v2.6.18-rc7~3^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c3ab204ccbe42d9eb60270e41110f2c5c9214952;p=linux-2.6-omap-h63xx.git

V4L/DVB (4494a): Fix compilation when V4L1 support is not present

VIDIOCGMBUF should be compiled only when V4L1 support is selected, since
this ioctl is from the obsoleted API.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 8393d472d3b..7e0cedc557d 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1190,6 +1190,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
 		}
 		return err;
 	}
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
 	case VIDIOCGMBUF:
 	{
 		struct video_mbuf *mbuf = arg;
@@ -1218,6 +1219,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
 		mutex_unlock(&q->lock);
 		return 0;
 	}
+#endif
 	default:
 		return v4l_compat_translate_ioctl(inode,file,cmd,arg,
 						  saa7146_video_do_ioctl);