summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88-video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-01-20 14:58:29 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-01-20 14:58:29 -0200
commit8d0b0d47bd35938d37c80461e9adc9407be5d5c6 (patch)
tree05b0fba76b724799d5056949f44f62838c8a43bb /linux/drivers/media/video/cx88/cx88-video.c
parentfa401a7a602778f320280012833475f52912c9cf (diff)
downloadmediapointer-dvb-s2-8d0b0d47bd35938d37c80461e9adc9407be5d5c6.tar.gz
mediapointer-dvb-s2-8d0b0d47bd35938d37c80461e9adc9407be5d5c6.tar.bz2
Renamed video_mux to cx88_video_mux and exported to cx88-blackbird
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> --- linux/drivers/media/video/cx88/cx88-video.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-video.c')
-rw-r--r--linux/drivers/media/video/cx88/cx88-video.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index f51c58e04..2936d9e30 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -430,8 +430,7 @@ void res_free(struct cx8800_dev *dev, struct cx8800_fh *fh, unsigned int bits)
/* ------------------------------------------------------------------ */
-/* static int video_mux(struct cx8800_dev *dev, unsigned int input) */
-static int video_mux(struct cx88_core *core, unsigned int input)
+int cx88_video_mux(struct cx88_core *core, unsigned int input)
{
/* struct cx88_core *core = dev->core; */
@@ -470,6 +469,7 @@ static int video_mux(struct cx88_core *core, unsigned int input)
}
return 0;
}
+EXPORT_SYMBOL(cx88_video_mux);
/* ------------------------------------------------------------------ */
@@ -1562,7 +1562,7 @@ static int vidioc_s_input (struct file *file, void *priv, unsigned int i)
mutex_lock(&core->lock);
cx88_newstation(core);
- video_mux(core,i);
+ cx88_video_mux(core,i);
mutex_unlock(&core->lock);
return 0;
}
@@ -2214,7 +2214,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
mutex_lock(&core->lock);
cx88_set_tvnorm(core,cx88_tvnorms);
init_controls(core);
- video_mux(core,0);
+ cx88_video_mux(core,0);
mutex_unlock(&core->lock);
/* start tvaudio thread */