summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-10-26 02:07:45 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-26 02:07:45 -0200
commit0112b169f6a802bc14c7d9c52eed37f5990dfa93 (patch)
tree3d9a28f99541f1f5d7a1fef224daf340e8e92c45 /linux/drivers/media/video/saa7134/saa7134.h
parent6d67fdc302e1b986dcbd6729167116a4463f1f03 (diff)
parentc8f0e62f66c8fae8399d077e41c8cbab137b3d4f (diff)
downloadmediapointer-dvb-s2-0112b169f6a802bc14c7d9c52eed37f5990dfa93.tar.gz
mediapointer-dvb-s2-0112b169f6a802bc14c7d9c52eed37f5990dfa93.tar.bz2
merge: http://linuxtv.org/hg/~tmerle/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 3669a6c5a..23b4f2499 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -617,9 +617,6 @@ void saa7134_buffer_next(struct saa7134_dev *dev, struct saa7134_dmaqueue *q);
void saa7134_buffer_timeout(unsigned long data);
void saa7134_dma_free(struct videobuf_queue *q,struct saa7134_buf *buf);
-int saa7134_buffer_requeue(struct saa7134_dev *dev,
- struct saa7134_dmaqueue *q);
-
int saa7134_set_dmabits(struct saa7134_dev *dev);
extern int (*saa7134_dmasound_init)(struct saa7134_dev *dev);
@@ -652,7 +649,6 @@ void saa7134_i2c_call_clients(struct saa7134_dev *dev,
extern struct video_device saa7134_video_template;
extern struct video_device saa7134_radio_template;
-void set_tvnorm(struct saa7134_dev *dev, struct saa7134_tvnorm *norm);
int saa7134_videoport_init(struct saa7134_dev *dev);
void saa7134_set_tvnorm_hw(struct saa7134_dev *dev);