diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-08-15 16:39:50 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-08-15 16:39:50 +0200 |
| commit | 8ab83d48dae5d54d59e02e8c0087580aba1d6842 (patch) | |
| tree | 69ebd72b8dd561af9b5af0f650fc0cb25a55326f /linux/drivers/media/common/saa7146_video.c | |
| parent | 04e963dbabd077673fbc46b533246190aebb95b5 (diff) | |
| parent | af1f59fa1dacf231cf12ff92ee3a50e0a43c47bf (diff) | |
| download | mediapointer-dvb-s2-8ab83d48dae5d54d59e02e8c0087580aba1d6842.tar.gz mediapointer-dvb-s2-8ab83d48dae5d54d59e02e8c0087580aba1d6842.tar.bz2 | |
merge from main
From: Patrick Boettcher <pb@linuxtv.org>
merge from main
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/common/saa7146_video.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 8b5dce34d..1fb373ee2 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1191,7 +1191,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int } return err; } -#ifdef VIDEO_V4L1_COMPAT +#ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCGMBUF: { struct video_mbuf *mbuf = arg; |