diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:21:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-18 12:21:25 -0300 |
| commit | 6802e30de304059d908100b6874f246c45c47792 (patch) | |
| tree | 357f49ba2ac92fe05facd95981bf51888e2afe8d /linux/drivers/media/video/bt8xx/bttv.h | |
| parent | 53c5d79124323a6862c2ec0f3c73edba4f35eb89 (diff) | |
| parent | 976a91082e499203f3700aa589a54aefedc3c22a (diff) | |
| download | mediapointer-dvb-s2-6802e30de304059d908100b6874f246c45c47792.tar.gz mediapointer-dvb-s2-6802e30de304059d908100b6874f246c45c47792.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv.h')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv.h b/linux/drivers/media/video/bt8xx/bttv.h index 93a1e989a..da7690fa8 100644 --- a/linux/drivers/media/video/bt8xx/bttv.h +++ b/linux/drivers/media/video/bt8xx/bttv.h @@ -17,6 +17,7 @@ #include <linux/videodev2.h> #include <linux/i2c.h> #include "compat.h" +#include <media/v4l2-device.h> #include <media/ir-common.h> #include <media/ir-kbd-i2c.h> #include <media/i2c-addr.h> @@ -197,6 +198,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 */ @@ -204,7 +206,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; |