diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
| commit | 84860bf0644d7c45afe7ddbd30731c3e3c371fae (patch) | |
| tree | d6c4b98a9c3fd9981e7fcc5d7729c9e01e327767 /drivers/char/ip2main.c | |
| parent | 8caf89157d64f1eedba37113afb4b303b2b3e301 (diff) | |
| parent | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/char/ip2main.c')
| -rw-r--r-- | drivers/char/ip2main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c index 9e4e26aef94e..d815d197dc3e 100644 --- a/drivers/char/ip2main.c +++ b/drivers/char/ip2main.c | |||
| @@ -721,8 +721,9 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) | |||
| 721 | } | 721 | } |
| 722 | 722 | ||
| 723 | if ( NULL != ( pB = i2BoardPtrTable[i] ) ) { | 723 | if ( NULL != ( pB = i2BoardPtrTable[i] ) ) { |
| 724 | class_device_create(ip2_class, MKDEV(IP2_IPL_MAJOR, | 724 | class_device_create(ip2_class, NULL, |
| 725 | 4 * i), NULL, "ipl%d", i); | 725 | MKDEV(IP2_IPL_MAJOR, 4 * i), |
| 726 | NULL, "ipl%d", i); | ||
| 726 | err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i), | 727 | err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i), |
| 727 | S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, | 728 | S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, |
| 728 | "ip2/ipl%d", i); | 729 | "ip2/ipl%d", i); |
| @@ -732,8 +733,9 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) | |||
| 732 | goto out_class; | 733 | goto out_class; |
| 733 | } | 734 | } |
| 734 | 735 | ||
| 735 | class_device_create(ip2_class, MKDEV(IP2_IPL_MAJOR, | 736 | class_device_create(ip2_class, NULL, |
| 736 | 4 * i + 1), NULL, "stat%d", i); | 737 | MKDEV(IP2_IPL_MAJOR, 4 * i + 1), |
| 738 | NULL, "stat%d", i); | ||
| 737 | err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1), | 739 | err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1), |
| 738 | S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, | 740 | S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR, |
| 739 | "ip2/stat%d", i); | 741 | "ip2/stat%d", i); |