aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18/cx18-driver.h
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-01-11 13:08:53 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:25 -0400
commit888cdb07741ab0098ccb8d9feff3f98cad048c26 (patch)
tree942168c99f00def299ce83eae6c3c1fffb8151ef /drivers/media/video/cx18/cx18-driver.h
parent3d05913d894a460b7dc8e5d93415fde21b986411 (diff)
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 @@
48#include <linux/dvb/audio.h> 48#include <linux/dvb/audio.h>
49#include <media/v4l2-common.h> 49#include <media/v4l2-common.h>
50#include <media/v4l2-ioctl.h> 50#include <media/v4l2-ioctl.h>
51#include <media/v4l2-device.h>
51#include <media/tuner.h> 52#include <media/tuner.h>
52#include "cx18-mailbox.h" 53#include "cx18-mailbox.h"
53#include "cx18-av-core.h" 54#include "cx18-av-core.h"
@@ -386,6 +387,8 @@ struct cx18 {
386 int num; /* board number, -1 during init! */ 387 int num; /* board number, -1 during init! */
387 char name[8]; /* board name for printk and interrupts (e.g. 'cx180') */ 388 char name[8]; /* board name for printk and interrupts (e.g. 'cx180') */
388 struct pci_dev *pci_dev; 389 struct pci_dev *pci_dev;
390 struct v4l2_device v4l2_dev;
391
389 const struct cx18_card *card; /* card information */ 392 const struct cx18_card *card; /* card information */
390 const char *card_name; /* full name of the card */ 393 const char *card_name; /* full name of the card */
391 const struct cx18_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */ 394 const struct cx18_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */