Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e90311a198e21902cda4fd4cac8e09bc6ce52603
Commit: e90311a198e21902cda4fd4cac8e09bc6ce52603
Parent: 54da49f5a4c739cf8de7838e049d0f9f548008d8
Author: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 20 13:58:29 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Wed Feb 21 13:34:44 2007 -0200
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 <[EMAIL PROTECTED]>
---
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 d226eb1..85e5183 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)
/* ------------------------------------------------------------------ */
-/* 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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
