diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
commit | eff68d452f1a6842fb05218fd93c774ffc4dbc5a (patch) | |
tree | dacd3bd93b5f9260034bb206d7182c4a2bc6fac0 /drivers/media/common/saa7146_video.c | |
parent | 6a9516989f94df10d9a27ba543c6b53b3e69c84a (diff) | |
parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
download | op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.zip op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.tar.gz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/media/common/saa7146_video.c')
-rw-r--r-- | drivers/media/common/saa7146_video.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 8393d47..7e0cedc5 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); |