diff options
| author |   Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-14 12:36:54 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:43:23 -0300 |
| commit | 74fc7bd9cec0ccdbea23659208492ec7ffc58297 (patch) | |
| tree | cd16dbc46ec3771da456d71e2d0f27519ca9ae79 /drivers/media/video/bt8xx/bttv.h | |
| parent | V4L/DVB (11045): v4l2: call v4l2_device_disconnect in USB drivers. (diff) | |
| download | linux-dev-74fc7bd9cec0ccdbea23659208492ec7ffc58297.tar.xz linux-dev-74fc7bd9cec0ccdbea23659208492ec7ffc58297.zip | |
V4L/DVB (11046): bttv: 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/bt8xx/bttv.h')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index e08719b378bd..85b0e3e9d382 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h @@ -16,6 +16,7 @@ #include <linux/videodev2.h> #include <linux/i2c.h> +#include <media/v4l2-device.h> #include <media/ir-common.h> #include <media/ir-kbd-i2c.h> #include <media/i2c-addr.h> @@ -196,6 +197,7 @@ struct bttv_core { /* device structs */ + struct v4l2_device v4l2_dev; struct pci_dev *pci; struct i2c_adapter i2c_adap; struct list_head subs; /* struct bttv_sub_device */ @@ -203,7 +205,6 @@ struct bttv_core { /* device config */ unsigned int nr; /* dev nr (for printk("bttv%d: ..."); */ unsigned int type; /* card type (pointer into tvcards[]) */ - char name[8]; /* dev name */ }; struct bttv; |