summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-core.c
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-core.c
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-core.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c
index 6559c80cc..d39005392 100644
--- a/linux/drivers/media/video/saa7134/saa7134-core.c
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c
@@ -477,8 +477,8 @@ void saa7134_buffer_timeout(unsigned long data)
/* resends a current buffer in queue after resume */
-int saa7134_buffer_requeue(struct saa7134_dev *dev,
- struct saa7134_dmaqueue *q)
+static int saa7134_buffer_requeue(struct saa7134_dev *dev,
+ struct saa7134_dmaqueue *q)
{
struct saa7134_buf *buf, *next;