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/block/paride/pg.c | |
| parent | 8caf89157d64f1eedba37113afb4b303b2b3e301 (diff) | |
| parent | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/block/paride/pg.c')
| -rw-r--r-- | drivers/block/paride/pg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c index b3982395f22b..82f2d6d2eeef 100644 --- a/drivers/block/paride/pg.c +++ b/drivers/block/paride/pg.c | |||
| @@ -674,7 +674,7 @@ static int __init pg_init(void) | |||
| 674 | for (unit = 0; unit < PG_UNITS; unit++) { | 674 | for (unit = 0; unit < PG_UNITS; unit++) { |
| 675 | struct pg *dev = &devices[unit]; | 675 | struct pg *dev = &devices[unit]; |
| 676 | if (dev->present) { | 676 | if (dev->present) { |
| 677 | class_device_create(pg_class, MKDEV(major, unit), | 677 | class_device_create(pg_class, NULL, MKDEV(major, unit), |
| 678 | NULL, "pg%u", unit); | 678 | NULL, "pg%u", unit); |
| 679 | err = devfs_mk_cdev(MKDEV(major, unit), | 679 | err = devfs_mk_cdev(MKDEV(major, unit), |
| 680 | S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u", | 680 | S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u", |