From 846c556b88da6cefc77bcd828f0266c7b6f1da29 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 5 Jun 2006 10:26:32 -0300 Subject: Removed all references to kernel stuff from videodev.h and videodev2.h From: Mauro Carvalho Chehab 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 --- linux/include/media/ovcamchip.h | 1 + linux/include/media/saa7146_vv.h | 2 +- linux/include/media/v4l2-dev.h | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'linux/include/media') 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 +#include #include /* --------------------------------- */ 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 - +#include #include #include 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) { -- cgit v1.2.3