diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-11 17:58:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-11 17:58:04 -0300 |
| commit | da2ce09c5417a5fe750ac5310d6e518bdc5bba49 (patch) | |
| tree | ff46e3f2e6cba83ccf725b0ee485b6428e68f55c /linux/include/media/v4l2-dev.h | |
| parent | c0e1a168c8871c030502120b0f02fda348e14db7 (diff) | |
| parent | 49e6c586ba2502f5cdce194081b3b9cfb590efec (diff) | |
| download | mediapointer-dvb-s2-da2ce09c5417a5fe750ac5310d6e518bdc5bba49.tar.gz mediapointer-dvb-s2-da2ce09c5417a5fe750ac5310d6e518bdc5bba49.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media/v4l2-dev.h')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index f43216d68..18f1bd706 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -47,10 +47,6 @@ #define VFL_TYPE_RADIO 2 #define VFL_TYPE_VTX 3 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) - const struct file_operations *fops; -#endif - /* Video standard functions */ extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs); extern int v4l2_video_std_construct(struct v4l2_standard *vs, @@ -101,7 +97,11 @@ struct v4l2_tvnorm { struct video_device { /* device ops */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) + const struct file_operations *fops; +#else struct file_operations *fops; +#endif /* device info */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) |