diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-30 00:18:49 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-30 00:18:49 +0200 |
commit | e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch) | |
tree | 2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /include/media/saa7146_vv.h | |
parent | [PATCH] libata: add FIXME above ata_dev_xfermask() (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
download | linux-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.tar.xz linux-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.zip |
Merge branch 'master'
Diffstat (limited to 'include/media/saa7146_vv.h')
-rw-r--r-- | include/media/saa7146_vv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index e5e749e984ee..4507cb61ae93 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -197,7 +197,8 @@ void saa7146_buffer_finish(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, void saa7146_buffer_next(struct saa7146_dev *dev, struct saa7146_dmaqueue *q,int vbi); int saa7146_buffer_queue(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, struct saa7146_buf *buf); void saa7146_buffer_timeout(unsigned long data); -void saa7146_dma_free(struct saa7146_dev *dev,struct saa7146_buf *buf); +void saa7146_dma_free(struct saa7146_dev* dev,struct videobuf_queue *q, + struct saa7146_buf *buf); int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv); int saa7146_vv_release(struct saa7146_dev* dev); |