From b4cd7d22b439cdc865623238af5cb16e877c67c5 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 10 Jun 2008 12:21:49 -0300 Subject: vivi: rename MODULE_NAME macro to VIVI_MODULE_NAME to avoid namespace conflicts From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/vivi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c index f8a76d38c..e367c6af9 100644 --- a/linux/drivers/media/video/vivi.c +++ b/linux/drivers/media/video/vivi.c @@ -48,7 +48,7 @@ #include #endif -#define MODULE_NAME "vivi" +#define VIVI_MODULE_NAME "vivi" /* Wake up at about 30 fps */ #define WAKE_NUMERATOR 30 @@ -1091,11 +1091,11 @@ static int vivi_release(void) if (-1 != dev->vfd->minor) { video_unregister_device(dev->vfd); printk(KERN_INFO "%s: /dev/video%d unregistered.\n", - MODULE_NAME, dev->vfd->minor); + VIVI_MODULE_NAME, dev->vfd->minor); } else { video_device_release(dev->vfd); printk(KERN_INFO "%s: /dev/video%d released.\n", - MODULE_NAME, dev->vfd->minor); + VIVI_MODULE_NAME, dev->vfd->minor); } kfree(dev); @@ -1210,7 +1210,7 @@ static int __init vivi_init(void) dev->vfd = vfd; printk(KERN_INFO "%s: V4L2 device registered as /dev/video%d\n", - MODULE_NAME, vfd->minor); + VIVI_MODULE_NAME, vfd->minor); } if (ret < 0) { -- cgit v1.2.3