Commit e90311a1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

V4L/DVB (5101): Renamed video_mux to cx88_video_mux

video_mux is renamed to cx88_video_mux to be exported to cx88-blackbird
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 54da49f5
...@@ -414,8 +414,7 @@ void res_free(struct cx8800_dev *dev, struct cx8800_fh *fh, unsigned int bits) ...@@ -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) */ int cx88_video_mux(struct cx88_core *core, unsigned int input)
static int video_mux(struct cx88_core *core, unsigned int input)
{ {
/* struct cx88_core *core = dev->core; */ /* struct cx88_core *core = dev->core; */
...@@ -454,6 +453,7 @@ static int video_mux(struct cx88_core *core, unsigned int input) ...@@ -454,6 +453,7 @@ static int video_mux(struct cx88_core *core, unsigned int input)
} }
return 0; return 0;
} }
EXPORT_SYMBOL(cx88_video_mux);
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
...@@ -1310,7 +1310,7 @@ static int vidioc_s_input (struct file *file, void *priv, unsigned int i) ...@@ -1310,7 +1310,7 @@ static int vidioc_s_input (struct file *file, void *priv, unsigned int i)
mutex_lock(&core->lock); mutex_lock(&core->lock);
cx88_newstation(core); cx88_newstation(core);
video_mux(core,i); cx88_video_mux(core,i);
mutex_unlock(&core->lock); mutex_unlock(&core->lock);
return 0; return 0;
} }
...@@ -1898,7 +1898,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, ...@@ -1898,7 +1898,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
mutex_lock(&core->lock); mutex_lock(&core->lock);
cx88_set_tvnorm(core,cx88_tvnorms); cx88_set_tvnorm(core,cx88_tvnorms);
init_controls(core); init_controls(core);
video_mux(core,0); cx88_video_mux(core,0);
mutex_unlock(&core->lock); mutex_unlock(&core->lock);
/* start tvaudio thread */ /* start tvaudio thread */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment