diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /drivers/block/paride/pt.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/block/paride/pt.c')
| -rw-r--r-- | drivers/block/paride/pt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c index d8d35233cf49..686c95573452 100644 --- a/drivers/block/paride/pt.c +++ b/drivers/block/paride/pt.c | |||
| @@ -971,7 +971,7 @@ static int __init pt_init(void) | |||
| 971 | devfs_mk_dir("pt"); | 971 | devfs_mk_dir("pt"); |
| 972 | for (unit = 0; unit < PT_UNITS; unit++) | 972 | for (unit = 0; unit < PT_UNITS; unit++) |
| 973 | if (pt[unit].present) { | 973 | if (pt[unit].present) { |
| 974 | class_device_create(pt_class, MKDEV(major, unit), | 974 | class_device_create(pt_class, NULL, MKDEV(major, unit), |
| 975 | NULL, "pt%d", unit); | 975 | NULL, "pt%d", unit); |
| 976 | err = devfs_mk_cdev(MKDEV(major, unit), | 976 | err = devfs_mk_cdev(MKDEV(major, unit), |
| 977 | S_IFCHR | S_IRUSR | S_IWUSR, | 977 | S_IFCHR | S_IRUSR | S_IWUSR, |
| @@ -980,7 +980,7 @@ static int __init pt_init(void) | |||
| 980 | class_device_destroy(pt_class, MKDEV(major, unit)); | 980 | class_device_destroy(pt_class, MKDEV(major, unit)); |
| 981 | goto out_class; | 981 | goto out_class; |
| 982 | } | 982 | } |
| 983 | class_device_create(pt_class, MKDEV(major, unit + 128), | 983 | class_device_create(pt_class, NULL, MKDEV(major, unit + 128), |
| 984 | NULL, "pt%dn", unit); | 984 | NULL, "pt%dn", unit); |
| 985 | err = devfs_mk_cdev(MKDEV(major, unit + 128), | 985 | err = devfs_mk_cdev(MKDEV(major, unit + 128), |
| 986 | S_IFCHR | S_IRUSR | S_IWUSR, | 986 | S_IFCHR | S_IRUSR | S_IWUSR, |