summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-driver.h
diff options
context:
space:
mode:
authorAndy Walls2009-01-11 19:08:53 +0100
committerMauro Carvalho Chehab2009-03-30 17:42:25 +0200
commit888cdb07741ab0098ccb8d9feff3f98cad048c26 (patch)
tree942168c99f00def299ce83eae6c3c1fffb8151ef /drivers/media/video/cx18/cx18-driver.h
parentV4L/DVB (10280): cx18: Rename structure members: dev to pci_dev and v4l2dev t... (diff)
downloadkernel-qcow2-linux-888cdb07741ab0098ccb8d9feff3f98cad048c26.tar.gz
kernel-qcow2-linux-888cdb07741ab0098ccb8d9feff3f98cad048c26.tar.xz
kernel-qcow2-linux-888cdb07741ab0098ccb8d9feff3f98cad048c26.zip
V4L/DVB (10281): cx18: Conversion to new V4L2 framework: use v4l2_device object
First step in conversion to the new V4L2 framework. Added per cx18 device instance of the v4l2_device and its registration. Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-driver.h')
-rw-r--r--drivers/media/video/cx18/cx18-driver.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 316ff333d4a5..2d5bcbf1b236 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -48,6 +48,7 @@
#include <linux/dvb/audio.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
+#include <media/v4l2-device.h>
#include <media/tuner.h>
#include "cx18-mailbox.h"
#include "cx18-av-core.h"
@@ -386,6 +387,8 @@ struct cx18 {
int num; /* board number, -1 during init! */
char name[8]; /* board name for printk and interrupts (e.g. 'cx180') */
struct pci_dev *pci_dev;
+ struct v4l2_device v4l2_dev;
+
const struct cx18_card *card; /* card information */
const char *card_name; /* full name of the card */
const struct cx18_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */