diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 01:07:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 01:07:17 -0300 |
| commit | 1012e50d3f53435f01b9af729ef23125eb4cc6e2 (patch) | |
| tree | 44233e4c0cc90db2e5c03083cbde03533d7755be /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | e9af8370a92c5280ed2470c72b3a4dbbd1e3b9b2 (diff) | |
| parent | 09a7c4d4e9d8120b3ec951bb9ab3ae040da8ad94 (diff) | |
| download | mediapointer-dvb-s2-1012e50d3f53435f01b9af729ef23125eb4cc6e2.tar.gz mediapointer-dvb-s2-1012e50d3f53435f01b9af729ef23125eb4cc6e2.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
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-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index 6f3f4f0f9..b83e910c3 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -450,8 +450,8 @@ static int empress_init(struct saa7134_dev *dev) printk(KERN_INFO "%s: registered device video%d [mpeg]\n", dev->name,dev->empress_dev->minor & 0x1f); - videobuf_queue_pci_init(&dev->empress_tsq, &saa7134_ts_qops, - dev->pci, &dev->slock, + videobuf_queue_sg_init(&dev->empress_tsq, &saa7134_ts_qops, + &dev->pci->dev, &dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_ALTERNATE, sizeof(struct saa7134_buf), |