diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-29 19:18:24 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-29 19:18:24 +0200 |
| commit | b658f057c86873a8cfe6e0a1d62dc661acc49d38 (patch) | |
| tree | b6539eba40cfd26e9b7cc4edcd22159c8ef31b5e /linux/drivers/media/video/ivtv | |
| parent | f317c36602dc0db74f8dbba71ad1db183f2ad7f2 (diff) | |
| parent | 4381ceef6895b12019f4d55a6f5ff9629194b259 (diff) | |
| download | mediapointer-dvb-s2-b658f057c86873a8cfe6e0a1d62dc661acc49d38.tar.gz mediapointer-dvb-s2-b658f057c86873a8cfe6e0a1d62dc661acc49d38.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/ivtv')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-fileops.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-fileops.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c index 7ec5c99f9..304261efc 100644 --- a/linux/drivers/media/video/ivtv/ivtv-fileops.c +++ b/linux/drivers/media/video/ivtv/ivtv-fileops.c @@ -39,7 +39,7 @@ associated VBI streams are also automatically claimed. Possible error returns: -EBUSY if someone else has claimed the stream or 0 on success. */ -int ivtv_claim_stream(struct ivtv_open_id *id, int type) +static int ivtv_claim_stream(struct ivtv_open_id *id, int type) { struct ivtv *itv = id->itv; struct ivtv_stream *s = &itv->streams[type]; diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.h b/linux/drivers/media/video/ivtv/ivtv-fileops.h index 2c8d5186c..df81e7901 100644 --- a/linux/drivers/media/video/ivtv/ivtv-fileops.h +++ b/linux/drivers/media/video/ivtv/ivtv-fileops.h @@ -38,11 +38,6 @@ void ivtv_unmute(struct ivtv *itv); /* Utilities */ -/* Try to claim a stream for the filehandle. Return 0 on success, - -EBUSY if stream already claimed. Once a stream is claimed, it - remains claimed until the associated filehandle is closed. */ -int ivtv_claim_stream(struct ivtv_open_id *id, int type); - /* Release a previously claimed stream. */ void ivtv_release_stream(struct ivtv_stream *s); |