summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-08 21:38:01 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:23 -0800
commitf958b68d40b870f5a0d1582f094bc93a53af7cd7 (patch)
treeabcaf487e5d1f55619b7e70639db1c9aced1756c /include
parent01cb9633e1b294c604c2dfa01dcac95daf775213 (diff)
downloadlinux-f958b68d40b870f5a0d1582f094bc93a53af7cd7.tar.bz2
[PATCH] v4l: 829: fixed user mode compiling
- Fixed user mode compiling. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/videodev.h12
-rw-r--r--include/linux/videodev2.h18
2 files changed, 28 insertions, 2 deletions
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 392592a040c5..91140091ced2 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -27,6 +27,18 @@ video_device_remove_file(struct video_device *vfd,
class_device_remove_file(&vfd->class_dev, attr);
}
+#if OBSOLETE_OWNER /* to be removed in 2.6.15 */
+/* helper functions to access driver private data. */
+static inline void *video_get_drvdata(struct video_device *dev)
+{
+ return dev->priv;
+}
+
+static inline void video_set_drvdata(struct video_device *dev, void *data)
+{
+ dev->priv = data;
+}
+#endif
extern int video_exclusive_open(struct inode *inode, struct file *file);
extern int video_exclusive_release(struct inode *inode, struct file *file);
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 65829a510aca..cbe15edbe668 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -15,12 +15,13 @@
*/
#ifdef __KERNEL__
#include <linux/time.h> /* need struct timeval */
+#include <linux/poll.h>
+#include <linux/device.h>
#endif
#include <linux/compiler.h> /* need __user */
-#include <linux/poll.h>
-#include <linux/device.h>
+#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.15 */
#define HAVE_V4L2 1
/*
@@ -30,6 +31,8 @@
#define VIDEO_MAX_FRAME 32
+#ifdef __KERNEL__
+
#define VFL_TYPE_GRABBER 0
#define VFL_TYPE_VBI 1
#define VFL_TYPE_RADIO 2
@@ -50,6 +53,15 @@ struct video_device
void (*release)(struct video_device *vfd);
+#if OBSOLETE_OWNER /* to be removed in 2.6.15 */
+ /* obsolete -- fops->owner is used instead */
+ struct module *owner;
+ /* dev->driver_data will be used instead some day.
+ * Use the video_{get|set}_drvdata() helper functions,
+ * so the switch over will be transparent for you.
+ * Or use {pci|usb}_{get|set}_drvdata() directly. */
+ void *priv;
+#endif
/* for videodev.c intenal usage -- please don't touch */
int users; /* video_exclusive_{open|close} ... */
@@ -87,6 +99,8 @@ extern int video_usercopy(struct inode *inode, struct file *file,
struct video_device *video_device_alloc(void);
void video_device_release(struct video_device *vfd);
+#endif
+
/*
* M I S C E L L A N E O U S
*/