diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 10:09:25 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 10:09:25 -0300 |
commit | 0fb7c2db703c043604353078f2b9fec995f60eeb (patch) | |
tree | a6ae1d8990021969faf04034fba9ecd8813f32d4 /linux/drivers/media/video/cx18/cx18-queue.h | |
parent | f098c162f9ceb707a0674bf3ca336b95841877e6 (diff) | |
parent | 995c07b049f1633deb6e269cc0e7978b8c0dff4e (diff) | |
download | mediapointer-dvb-s2-0fb7c2db703c043604353078f2b9fec995f60eeb.tar.gz mediapointer-dvb-s2-0fb7c2db703c043604353078f2b9fec995f60eeb.tar.bz2 |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb-critical
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-queue.h')
-rw-r--r-- | linux/drivers/media/video/cx18/cx18-queue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-queue.h b/linux/drivers/media/video/cx18/cx18-queue.h index 91423b986..7f93bb13c 100644 --- a/linux/drivers/media/video/cx18/cx18-queue.h +++ b/linux/drivers/media/video/cx18/cx18-queue.h @@ -46,7 +46,7 @@ void cx18_queue_init(struct cx18_queue *q); void cx18_enqueue(struct cx18_stream *s, struct cx18_buffer *buf, struct cx18_queue *q); struct cx18_buffer *cx18_dequeue(struct cx18_stream *s, struct cx18_queue *q); -struct cx18_buffer *cx18_queue_find_buf(struct cx18_stream *s, u32 id, +struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id, u32 bytesused); void cx18_flush_queues(struct cx18_stream *s); |