diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 10:22:44 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-22 10:22:44 -0300 |
commit | b5ff2cd5cc913156858a0b15a186144f146c89d7 (patch) | |
tree | edd0f29cf926feb480533f9880c60e9a833ac3fb /linux/drivers/media/video/cx18/cx18-queue.h | |
parent | 14eb37189ae76c7f329e1eb00c023198f6b3a33d (diff) | |
parent | 0fb7c2db703c043604353078f2b9fec995f60eeb (diff) | |
download | mediapointer-dvb-s2-b5ff2cd5cc913156858a0b15a186144f146c89d7.tar.gz mediapointer-dvb-s2-b5ff2cd5cc913156858a0b15a186144f146c89d7.tar.bz2 |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Priority: normal
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); |