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/lp.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/lp.c')
| -rw-r--r-- | drivers/char/lp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/lp.c b/drivers/char/lp.c index 2afb9038dbc5..e57260525293 100644 --- a/drivers/char/lp.c +++ b/drivers/char/lp.c | |||
| @@ -805,7 +805,7 @@ static int lp_register(int nr, struct parport *port) | |||
| 805 | if (reset) | 805 | if (reset) |
| 806 | lp_reset(nr); | 806 | lp_reset(nr); |
| 807 | 807 | ||
| 808 | class_device_create(lp_class, MKDEV(LP_MAJOR, nr), NULL, | 808 | class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), NULL, |
| 809 | "lp%d", nr); | 809 | "lp%d", nr); |
| 810 | devfs_mk_cdev(MKDEV(LP_MAJOR, nr), S_IFCHR | S_IRUGO | S_IWUGO, | 810 | devfs_mk_cdev(MKDEV(LP_MAJOR, nr), S_IFCHR | S_IRUGO | S_IWUGO, |
| 811 | "printers/%d", nr); | 811 | "printers/%d", nr); |