aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/video1394.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ieee1394/video1394.c')
-rw-r--r--drivers/ieee1394/video1394.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c
index bd28adfd7afc..e03024eeeac1 100644
--- a/drivers/ieee1394/video1394.c
+++ b/drivers/ieee1394/video1394.c
@@ -1315,8 +1315,7 @@ static struct ieee1394_device_id video1394_id_table[] = {
1315MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 1315MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
1316 1316
1317static struct hpsb_protocol_driver video1394_driver = { 1317static struct hpsb_protocol_driver video1394_driver = {
1318 .name = VIDEO1394_DRIVER_NAME, 1318 .name = VIDEO1394_DRIVER_NAME,
1319 .id_table = video1394_id_table,
1320}; 1319};
1321 1320
1322 1321
@@ -1504,7 +1503,6 @@ static int __init video1394_init_module (void)
1504 1503
1505 cdev_init(&video1394_cdev, &video1394_fops); 1504 cdev_init(&video1394_cdev, &video1394_fops);
1506 video1394_cdev.owner = THIS_MODULE; 1505 video1394_cdev.owner = THIS_MODULE;
1507 kobject_set_name(&video1394_cdev.kobj, VIDEO1394_DRIVER_NAME);
1508 ret = cdev_add(&video1394_cdev, IEEE1394_VIDEO1394_DEV, 16); 1506 ret = cdev_add(&video1394_cdev, IEEE1394_VIDEO1394_DEV, 16);
1509 if (ret) { 1507 if (ret) {
1510 PRINT_G(KERN_ERR, "video1394: unable to get minor device block"); 1508 PRINT_G(KERN_ERR, "video1394: unable to get minor device block");