Skip to content

Commit

Permalink
V4L/DVB (8024): vivi: rename MODULE_NAME macro to VIVI_MODULE_NAME to…
Browse files Browse the repository at this point in the history 
… avoid namespace conflicts

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Mauro Carvalho Chehab committed Jul 20, 2008
1 parent 745271a commit 584ce48
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/media/video/vivi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 584ce48

Please sign in to comment.