dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Mauro Carvalho Chehab 2008-06-10 15:21:49 -03:00
parent 745271aefe
commit 584ce48de9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/video/vivi.c
View File

@ -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) {