diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 13:09:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 13:09:47 -0700 |
| commit | 84860bf0644d7c45afe7ddbd30731c3e3c371fae (patch) | |
| tree | d6c4b98a9c3fd9981e7fcc5d7729c9e01e327767 /drivers/ieee1394/video1394.c | |
| parent | 8caf89157d64f1eedba37113afb4b303b2b3e301 (diff) | |
| parent | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/ieee1394/video1394.c')
| -rw-r--r-- | drivers/ieee1394/video1394.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index 11be9c9c82a..23911da5015 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -1370,7 +1370,7 @@ static void video1394_add_host (struct hpsb_host *host) hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->host->id); minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->host->id; - class_device_create(hpsb_protocol_class, MKDEV( + class_device_create(hpsb_protocol_class, NULL, MKDEV( IEEE1394_MAJOR, minor), NULL, "%s-%d", VIDEO1394_DRIVER_NAME, ohci->host->id); devfs_mk_cdev(MKDEV(IEEE1394_MAJOR, minor), |