---

yaml --- r: 103826 b: refs/heads/master c: 584ce48 h: refs/heads/master v: v3
git-mirror · Jul 20, 2008 · db969e4 · db969e4
1 parent e4c206d
commit db969e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 745271aefec602326b1dafded778d1eb94bc50ad
+refs/heads/master: 584ce48de9e01838402c8e82c78f166775ea3075
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/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) {