summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cpia.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-08 17:40:58 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-07-08 17:40:58 +0200
commite9314ad63401c89bffe82b165eb7ae630c05a75d (patch)
treeb31a77f9ccfea646348025aae7452e900e61a761 /linux/drivers/media/video/cpia.h
parentd784aba6717da44bfef18007146f6d00280e39fe (diff)
downloadmediapointer-dvb-s2-e9314ad63401c89bffe82b165eb7ae630c05a75d.tar.gz
mediapointer-dvb-s2-e9314ad63401c89bffe82b165eb7ae630c05a75d.tar.bz2
v4l-dvb: remove support for kernels < 2.6.16
From: Hans Verkuil <hverkuil@xs4all.nl> Phase 4 removes the compatibility support for kernels < 2.6.16. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cpia.h')
-rw-r--r--linux/drivers/media/video/cpia.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/linux/drivers/media/video/cpia.h b/linux/drivers/media/video/cpia.h
index d579b5edb..f90857a39 100644
--- a/linux/drivers/media/video/cpia.h
+++ b/linux/drivers/media/video/cpia.h
@@ -47,9 +47,7 @@
#include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/list.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
#include <linux/mutex.h>
-#endif
#include "compat.h"
struct cpia_camera_ops
@@ -250,11 +248,7 @@ enum v4l_camstates {
struct cam_data {
struct list_head cam_data_list;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex busy_lock; /* guard against SMP multithreading */
-#else
- struct semaphore busy_lock; /* guard against SMP multithreading */
-#endif
struct cpia_camera_ops *ops; /* lowlevel driver operations */
void *lowlevel_data; /* private data for lowlevel driver */
u8 *raw_image; /* buffer for raw image data */
@@ -269,11 +263,7 @@ struct cam_data {
u8 mainsFreq; /* for flicker control */
/* proc interface */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex param_lock; /* params lock for this camera */
-#else
- struct semaphore param_lock; /* params lock for this camera */
-#endif
struct cam_params params; /* camera settings */
struct proc_dir_entry *proc_entry; /* /proc/cpia/videoX */