diff options
author | 2005-07-08 08:52:42 -0700 | |
---|---|---|
committer | 2005-07-08 08:52:42 -0700 | |
commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /drivers/media/dvb/ttpci/av7110_av.h | |
parent | [PATCH] Documentation (diff) | |
parent | [PATCH] Add MAINTAINERS entry for audit subsystem (diff) | |
download | linux-dev-88c3cdfdde3cf87e1831265ea4246430bef34fc9.tar.xz linux-dev-88c3cdfdde3cf87e1831265ea4246430bef34fc9.zip |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110_av.h')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_av.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_av.h b/drivers/media/dvb/ttpci/av7110_av.h index cc5e7a7e87c3..45dc144b8b43 100644 --- a/drivers/media/dvb/ttpci/av7110_av.h +++ b/drivers/media/dvb/ttpci/av7110_av.h @@ -3,14 +3,14 @@ struct av7110; -extern void av7110_set_vidmode(struct av7110 *av7110, int mode); +extern int av7110_set_vidmode(struct av7110 *av7110, int mode); extern int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len); extern int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen); extern int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len); extern int av7110_set_volume(struct av7110 *av7110, int volleft, int volright); -extern void av7110_av_stop(struct av7110 *av7110, int av); +extern int av7110_av_stop(struct av7110 *av7110, int av); extern int av7110_av_start_record(struct av7110 *av7110, int av, struct dvb_demux_feed *dvbdmxfeed); extern int av7110_av_start_play(struct av7110 *av7110, int av); |