summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-dvb.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-25 00:48:54 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-25 00:48:54 -0300
commit23d271bea2b77095cc79f0c7356d7e1131bcaeae (patch)
tree9587618e84489f1d0cbe7263bfaa674ea18e30a5 /linux/drivers/media/video/saa7134/saa7134-dvb.c
parent4e45e0172add32a7af042e418add1d2f1e4ae5a4 (diff)
downloadmediapointer-dvb-s2-23d271bea2b77095cc79f0c7356d7e1131bcaeae.tar.gz
mediapointer-dvb-s2-23d271bea2b77095cc79f0c7356d7e1131bcaeae.tar.bz2
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Subject: Convert videobuf-dma-sg to generic DMA API Date: Tue, 19 Feb 2008 13:40:54 +0100 (CET) videobuf-dma-sg does not need to depend on PCI. Switch it to using generic DMA API, convert all affected drivers, relax Kconfig restriction, improve compile-time type checking, fix some Coding Style violations while at it. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-dvb.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-dvb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index 47675730a..e6a2e8171 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -899,8 +899,8 @@ static int dvb_init(struct saa7134_dev *dev)
dev->ts.nr_bufs = 32;
dev->ts.nr_packets = 32*4;
dev->dvb.name = dev->name;
- videobuf_queue_pci_init(&dev->dvb.dvbq, &saa7134_ts_qops,
- dev->pci, &dev->slock,
+ videobuf_queue_sg_init(&dev->dvb.dvbq, &saa7134_ts_qops,
+ &dev->pci->dev, &dev->slock,
V4L2_BUF_TYPE_VIDEO_CAPTURE,
V4L2_FIELD_ALTERNATE,
sizeof(struct saa7134_buf),