V4L/DVB (5101): Renamed video_mux to cx88_video_mux
authorMauro Carvalho Chehab <mchehab@infradead.org>
Sat, 20 Jan 2007 16:58:29 +0000 (13:58 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 21 Feb 2007 15:34:44 +0000 (13:34 -0200)
video_mux is renamed to cx88_video_mux to be exported to cx88-blackbird

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/cx88/cx88-video.c

index d226eb1..85e5183 100644 (file)
@@ -414,8 +414,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; */
 
@@ -454,6 +453,7 @@ static int video_mux(struct cx88_core *core, unsigned int input)
        }
        return 0;
 }
+EXPORT_SYMBOL(cx88_video_mux);
 
 /* ------------------------------------------------------------------ */
 
@@ -1310,7 +1310,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;
 }
@@ -1898,7 +1898,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 */