summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-streams.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-24 08:35:23 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-24 08:35:23 -0200
commit18efb709ad3602aebb032ef3f23aba5d45a44d38 (patch)
treebbcd724ecf5864b723f46e7463a8a0c310fa79d4 /linux/drivers/media/video/cx18/cx18-streams.h
parent31674e74f8cbf0314f12262b769aa8254e49805f (diff)
parentc73a2ef55808dad64c72bdc00490c63333b8351c (diff)
downloadmediapointer-dvb-s2-18efb709ad3602aebb032ef3f23aba5d45a44d38.tar.gz
mediapointer-dvb-s2-18efb709ad3602aebb032ef3f23aba5d45a44d38.tar.bz2
merge http://linuxtv.org/hg/~mkrufky/windham
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-streams.h')
-rw-r--r--linux/drivers/media/video/cx18/cx18-streams.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-streams.h b/linux/drivers/media/video/cx18/cx18-streams.h
index f327e947b..7218b1504 100644
--- a/linux/drivers/media/video/cx18/cx18-streams.h
+++ b/linux/drivers/media/video/cx18/cx18-streams.h
@@ -4,6 +4,7 @@
* Derived from ivtv-streams.h
*
* Copyright (C) 2007 Hans Verkuil <hverkuil@xs4all.nl>
+ * Copyright (C) 2008 Andy Walls <awalls@radix.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,6 +23,7 @@
*/
u32 cx18_find_handle(struct cx18 *cx);
+struct cx18_stream *cx18_handle_to_stream(struct cx18 *cx, u32 handle);
int cx18_streams_setup(struct cx18 *cx);
int cx18_streams_register(struct cx18 *cx);
void cx18_streams_cleanup(struct cx18 *cx, int unregister);