diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-10 15:21:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 07:09:18 -0300 |
| commit | 584ce48de9e01838402c8e82c78f166775ea3075 (patch) | |
| tree | 280744e8aebd277029576d501714008c73862801 /drivers/media | |
| parent | 745271aefec602326b1dafded778d1eb94bc50ad (diff) | |
| download | linux-stable-584ce48de9e01838402c8e82c78f166775ea3075.tar.gz linux-stable-584ce48de9e01838402c8e82c78f166775ea3075.tar.bz2 linux-stable-584ce48de9e01838402c8e82c78f166775ea3075.zip | |
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/vivi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 9a8ded371eb8..059b01c11dc1 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) { |