aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885/cx23885.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-13 08:02:43 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:43:48 -0300
commitc0714f6cc6a7850062db41d5b2b8b90e5682ae41 (patch)
tree613844eec6820177fba20d290c99949878dbb219 /drivers/media/video/cx23885/cx23885.h
parent8bbd90ce80d39d372857235f00c7abb208bd9e4f (diff)
downloadkernel_samsung_smdk4412-c0714f6cc6a7850062db41d5b2b8b90e5682ae41.zip
kernel_samsung_smdk4412-c0714f6cc6a7850062db41d5b2b8b90e5682ae41.tar.gz
kernel_samsung_smdk4412-c0714f6cc6a7850062db41d5b2b8b90e5682ae41.tar.bz2
V4L/DVB (11295): cx23885: convert to v4l2_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885.h')
-rw-r--r--drivers/media/video/cx23885/cx23885.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 779fc35..ba57643 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -24,7 +24,7 @@
#include <linux/i2c-algo-bit.h>
#include <linux/kdev_t.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-device.h>
#include <media/tuner.h>
#include <media/tveeprom.h>
#include <media/videobuf-dma-sg.h>
@@ -277,6 +277,7 @@ struct cx23885_tsport {
struct cx23885_dev {
struct list_head devlist;
atomic_t refcount;
+ struct v4l2_device v4l2_dev;
/* pci stuff */
struct pci_dev *pci;
@@ -342,6 +343,11 @@ struct cx23885_dev {
};
+static inline struct cx23885_dev *to_cx23885(struct v4l2_device *v4l2_dev)
+{
+ return container_of(v4l2_dev, struct cx23885_dev, v4l2_dev);
+}
+
extern struct list_head cx23885_devlist;
#define SRAM_CH01 0 /* Video A */