From cc64aacbe823925c5cd8593e2f0e0fe7ba896053 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 8 Jun 2006 11:52:11 -0300
Subject: 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>
---
linux/include/media/v4l2-dev.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'linux/include/media')
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)
--
cgit v1.2.3