From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 10 Jun 2008 18:21:49 +0000 (-0300)
Subject: V4L/DVB (8024): vivi: rename MODULE_NAME macro to VIVI_MODULE_NAME to avoid namespace... 
X-Git-Tag: v2.6.27-rc1~966^2~235
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=584ce48de9e01838402c8e82c78f166775ea3075;p=linux-2.6

V4L/DVB (8024): vivi: rename MODULE_NAME macro to VIVI_MODULE_NAME to avoid namespace conflicts

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 9a8ded371e..059b01c11d 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -39,7 +39,7 @@
 #include <linux/highmem.h>
 #include <linux/freezer.h>
 
-#define MODULE_NAME "vivi"
+#define VIVI_MODULE_NAME "vivi"
 
 /* Wake up at about 30 fps */
 #define WAKE_NUMERATOR 30
@@ -1022,11 +1022,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);
@@ -1139,7 +1139,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) {