diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-08 11:52:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-08 11:52:11 -0300 |
| commit | cc64aacbe823925c5cd8593e2f0e0fe7ba896053 (patch) | |
| tree | b43afa1bb3bf6163c9250853984827db101f9978 /linux/include | |
| parent | c9afdbe77a95a51cc16765495700227b3870e4cf (diff) | |
| download | mediapointer-dvb-s2-cc64aacbe823925c5cd8593e2f0e0fe7ba896053.tar.gz mediapointer-dvb-s2-cc64aacbe823925c5cd8593e2f0e0fe7ba896053.tar.bz2 | |
Fix compilation with kernel 2.6.17
From: Andrew Ruder <andy@aeruder.net>
This bug were introduced by the changes at videodev2.h
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -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) |