From db969e427257a2fc7effbb66f1b142c36a8d368e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 10 Jun 2008 15:21:49 -0300 Subject: [PATCH] --- yaml --- r: 103826 b: refs/heads/master c: 584ce48de9e01838402c8e82c78f166775ea3075 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 27491e957de2..f580b02ee636 100644 --- 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 index 9a8ded371eb8..059b01c11dc1 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -39,7 +39,7 @@ #include #include -#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) {