diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-01-20 11:58:29 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:34:44 -0500 |
commit | e90311a198e21902cda4fd4cac8e09bc6ce52603 (patch) | |
tree | 7eb62ef753f4f13152cf9b663b0cefa7fe4588e3 /drivers/media/video/cx88/cx88-video.c | |
parent | 54da49f5a4c739cf8de7838e049d0f9f548008d8 (diff) |
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: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-video.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index d226eb1d38fa..85e51831e774 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -414,8 +414,7 @@ void res_free(struct cx8800_dev *dev, struct cx8800_fh *fh, unsigned int bits) | |||
414 | 414 | ||
415 | /* ------------------------------------------------------------------ */ | 415 | /* ------------------------------------------------------------------ */ |
416 | 416 | ||
417 | /* static int video_mux(struct cx8800_dev *dev, unsigned int input) */ | 417 | int cx88_video_mux(struct cx88_core *core, unsigned int input) |
418 | static int video_mux(struct cx88_core *core, unsigned int input) | ||
419 | { | 418 | { |
420 | /* struct cx88_core *core = dev->core; */ | 419 | /* struct cx88_core *core = dev->core; */ |
421 | 420 | ||
@@ -454,6 +453,7 @@ static int video_mux(struct cx88_core *core, unsigned int input) | |||
454 | } | 453 | } |
455 | return 0; | 454 | return 0; |
456 | } | 455 | } |
456 | EXPORT_SYMBOL(cx88_video_mux); | ||
457 | 457 | ||
458 | /* ------------------------------------------------------------------ */ | 458 | /* ------------------------------------------------------------------ */ |
459 | 459 | ||
@@ -1310,7 +1310,7 @@ static int vidioc_s_input (struct file *file, void *priv, unsigned int i) | |||
1310 | 1310 | ||
1311 | mutex_lock(&core->lock); | 1311 | mutex_lock(&core->lock); |
1312 | cx88_newstation(core); | 1312 | cx88_newstation(core); |
1313 | video_mux(core,i); | 1313 | cx88_video_mux(core,i); |
1314 | mutex_unlock(&core->lock); | 1314 | mutex_unlock(&core->lock); |
1315 | return 0; | 1315 | return 0; |
1316 | } | 1316 | } |
@@ -1898,7 +1898,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, | |||
1898 | mutex_lock(&core->lock); | 1898 | mutex_lock(&core->lock); |
1899 | cx88_set_tvnorm(core,cx88_tvnorms); | 1899 | cx88_set_tvnorm(core,cx88_tvnorms); |
1900 | init_controls(core); | 1900 | init_controls(core); |
1901 | video_mux(core,0); | 1901 | cx88_video_mux(core,0); |
1902 | mutex_unlock(&core->lock); | 1902 | mutex_unlock(&core->lock); |
1903 | 1903 | ||
1904 | /* start tvaudio thread */ | 1904 | /* start tvaudio thread */ |