diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
| commit | c30e05a83632aeb144f9d3912d39162564244a34 (patch) | |
| tree | 9877e4ed4167591ccb709ffbee27d7766986dabb /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | ba8e7e903d8aaa290f8528c1beba1284c1d33ddf (diff) | |
| parent | e2b3b766697ca509f1281178161156ab8df5b0d5 (diff) | |
| download | mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.gz mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/oxford2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 74b881864..002422380 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1149,7 +1149,9 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, printk(KERN_INFO "%s: registered device video%d [v4l2]\n", dev->name,dev->video_dev->minor & 0x1f); - dev->vbi_dev = vdev_init(dev,&saa7134_vbi_template,"vbi"); + dev->vbi_dev = vdev_init(dev, &saa7134_video_template, "vbi"); + dev->vbi_dev->type = VID_TYPE_TUNER | VID_TYPE_TELETEXT; + err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI, vbi_nr[dev->nr]); if (err < 0) |