summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-streams.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-08 07:25:08 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-08 07:25:08 -0300
commitc13f70467621e2c352f93b336b382e70ea24d218 (patch)
tree582367340fe7529eb3fec3c514ec9d4b2f68ff71 /linux/drivers/media/video/cx18/cx18-streams.c
parenta953cf4edb8db13f8b7d20c793696a13ffcd3333 (diff)
parent9380e197397e3f8404fa2d2effe5c84b6f56735b (diff)
downloadmediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.gz
mediapointer-dvb-s2-c13f70467621e2c352f93b336b382e70ea24d218.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-streams.c')
-rw-r--r--linux/drivers/media/video/cx18/cx18-streams.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-streams.c b/linux/drivers/media/video/cx18/cx18-streams.c
index deacdb836..df99070e6 100644
--- a/linux/drivers/media/video/cx18/cx18-streams.c
+++ b/linux/drivers/media/video/cx18/cx18-streams.c
@@ -41,9 +41,7 @@ static struct file_operations cx18_v4l2_enc_fops = {
.open = cx18_v4l2_open,
/* FIXME change to video_ioctl2 if serialization lock can be removed */
.ioctl = cx18_v4l2_ioctl,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
.compat_ioctl = v4l_compat_ioctl32,
-#endif
.release = cx18_v4l2_close,
.poll = cx18_v4l2_enc_poll,
};