diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:46 -0400 |
| commit | 4291130595065aa3c9fbb9130231f65e4914629a (patch) | |
| tree | 988be49185231866ac4e42d6154994b244e6f991 /drivers/media/common/saa7146_video.c | |
| parent | d3148ce9a65813a8020473739c200cb63036f84c (diff) | |
| parent | eff68d452f1a6842fb05218fd93c774ffc4dbc5a (diff) | |
Merge branch 'upstream-fixes' into upstream
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 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); |