diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-06 09:28:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-06 09:28:30 -0300 |
| commit | 9f9d0d9c21ed8c31ec1672eeb262502af5b1e326 (patch) | |
| tree | fbe9d7b2ddb9aa40a9f806c1e1cf997c082672cf /linux/include/media | |
| parent | 645ceb64cb84353e91335ce510ba20342351f4d1 (diff) | |
| parent | bae6d2d03bd97c9a01a7a2340ac317ab16db318b (diff) | |
| download | mediapointer-dvb-s2-9f9d0d9c21ed8c31ec1672eeb262502af5b1e326.tar.gz mediapointer-dvb-s2-9f9d0d9c21ed8c31ec1672eeb262502af5b1e326.tar.bz2 | |
merge: http://linuxtv.org/hg/~quincy/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 2a55cd41c..739800642 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -205,7 +205,7 @@ struct video_device int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i); -#ifdef HAVE_V4L1 +#ifdef CONFIG_VIDEO_V4L1_COMPAT /* buffer type is struct vidio_mbuf * */ int (*vidiocgmbuf) (struct file *file, void *fh, struct video_mbuf *p); #endif @@ -362,7 +362,7 @@ extern int video_usercopy(struct inode *inode, struct file *file, unsigned int cmd, void *arg)); -#ifdef HAVE_V4L1 +#ifdef CONFIG_VIDEO_V4L1_COMPAT #include <linux/mm.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) @@ -384,7 +384,7 @@ video_device_remove_file(struct video_device *vfd, } #endif -#endif /* HAVE_V4L1 */ +#endif /* CONFIG_VIDEO_V4L1_COMPAT */ #ifdef OBSOLETE_OWNER /* to be removed soon */ /* helper functions to access driver private data. */ |