diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-05 10:26:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-05 10:26:32 -0300 |
| commit | 846c556b88da6cefc77bcd828f0266c7b6f1da29 (patch) | |
| tree | e6a9406a07b081634e2e48c079da28fc118afb9a /linux/include/media | |
| parent | c0f3a250e42e51edca499213fb9d7e041fcd0cf9 (diff) | |
| download | mediapointer-dvb-s2-846c556b88da6cefc77bcd828f0266c7b6f1da29.tar.gz mediapointer-dvb-s2-846c556b88da6cefc77bcd828f0266c7b6f1da29.tar.bz2 | |
Removed all references to kernel stuff from videodev.h and videodev2.h
From: Mauro Carvalho Chehab <mchehab@infradead.org>
The videodev.h and videodev2.h describe the public API for V4L and V4L2.
It shouldn't have there any kernel-specific stuff. Those were moved to
v4l2-dev.h.
This patch removes some uneeded headers and include v4l2-common.h on all
V4L driver. This header includes device implementation of V4L2 API provided
on v4l2-dev.h as well as V4L2 internal ioctls that provides connections
between master driver and its i2c devices.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/ovcamchip.h | 1 | ||||
| -rw-r--r-- | linux/include/media/saa7146_vv.h | 2 | ||||
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/linux/include/media/ovcamchip.h b/linux/include/media/ovcamchip.h index 773fb09c6..9813334d6 100644 --- a/linux/include/media/ovcamchip.h +++ b/linux/include/media/ovcamchip.h @@ -16,6 +16,7 @@ #include "compat.h" #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/i2c.h> /* --------------------------------- */ diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h index 4507cb61a..83fe2e3d1 100644 --- a/linux/include/media/saa7146_vv.h +++ b/linux/include/media/saa7146_vv.h @@ -2,7 +2,7 @@ #define __SAA7146_VV__ #include <linux/videodev.h> - +#include <media/v4l2-common.h> #include <media/saa7146.h> #include <media/video-buf.h> diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index f1822e460..d3181cf0e 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -322,7 +322,7 @@ struct video_device int (*initialize)(struct video_device *); #endif -#if OBSOLETE_OWNER /* to be removed soon */ +#ifdef OBSOLETE_OWNER /* to be removed soon */ /* obsolete -- fops->owner is used instead */ struct module *owner; /* dev->driver_data will be used instead some day. @@ -388,7 +388,7 @@ video_device_remove_file(struct video_device *vfd, } #endif -#if OBSOLETE_OWNER /* to be removed soon */ +#ifdef OBSOLETE_OWNER /* to be removed soon */ /* helper functions to access driver private data. */ static inline void *video_get_drvdata(struct video_device *dev) { |