diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-08 14:19:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-08 14:19:23 -0700 |
| commit | ad552692a4489917fa4b71f9c6a91baae4aee799 (patch) | |
| tree | 26cd1c8a92f9c8f9a219961fe054adbf877e85f4 /drivers/media/video/saa7134/saa7134-video.c | |
| parent | 20dbfad8e5dfea56b3cb0cfd4465f01c37b57aa6 (diff) | |
| parent | 0851fb48486c044476b019029245cb9b348fca33 (diff) | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-video.c')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c index 8656f2400e1..2c171af9a9f 100644 --- a/drivers/media/video/saa7134/saa7134-video.c +++ b/drivers/media/video/saa7134/saa7134-video.c @@ -2087,7 +2087,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, struct v4l2_format *f = arg; return saa7134_try_fmt(dev,fh,f); } -#ifdef CONFIG_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCGMBUF: { struct video_mbuf *mbuf = arg; |